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 08bd8b20821..95b043fb82c 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 @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.configuration -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.ProjectKeys import com.intellij.openapi.externalSystem.model.project.ExternalSystemSourceType @@ -37,6 +36,7 @@ import org.jetbrains.kotlin.idea.inspections.gradle.getDependencyModules 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.statistics.KotlinStatisticsTrigger import org.jetbrains.kotlin.statistics.KotlinTargetTrigger import org.jetbrains.plugins.gradle.model.ExternalProjectDependency import org.jetbrains.plugins.gradle.model.ExternalSourceSet @@ -193,7 +193,7 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension() val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java) if (mppModel != null) { mppModel.targets.filterNot { it.name == "metadata" }.forEach { target -> - FUSApplicationUsageTrigger.getInstance().trigger(KotlinTargetTrigger::class.java, target.name) + KotlinStatisticsTrigger.trigger(KotlinTargetTrigger::class.java, target.name) } return super.populateModuleDependencies(gradleModule, ideModule, ideProject) } @@ -214,7 +214,7 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension() ideModule.coroutines = gradleModel.coroutines ideModule.platformPluginId = gradleModel.platformPluginId - FUSApplicationUsageTrigger.getInstance().trigger( + KotlinStatisticsTrigger.trigger( KotlinTargetTrigger::class.java, gradleModel.platformPluginId ?: "none" ) 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 d98d0c6e0dc..5395d52d93f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.pullUp -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.editor.Editor @@ -118,12 +118,12 @@ class KotlinPullUpHandler : AbstractPullPushMembersHandler( override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { super.invoke(project, elements, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, 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 2b8a97c8051..a5fa3f78fcc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.pushDown -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.editor.Editor @@ -91,11 +91,11 @@ class KotlinPushDownHandler : AbstractPullPushMembersHandler( override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { super.invoke(project, elements, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AbstractReferenceSubstitutionRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AbstractReferenceSubstitutionRenameHandler.kt index 738d78f9a88..7426be958ba 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AbstractReferenceSubstitutionRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AbstractReferenceSubstitutionRenameHandler.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.application.ApplicationManager @@ -66,7 +66,7 @@ abstract class AbstractReferenceSubstitutionRenameHandler( override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) { val elementToRename = getElementToRename(dataContext) ?: return - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) val wrappingContext = DataContext { id -> if (CommonDataKeys.PSI_ELEMENT.`is`(id)) return@DataContext elementToRename @@ -82,6 +82,6 @@ abstract class AbstractReferenceSubstitutionRenameHandler( override fun invoke(project: Project, elements: Array, dataContext: DataContext) { // Can't be invoked outside of a text editor - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticInheritorRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticInheritorRenamer.kt index 77be45a9b1d..1771369bd1e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticInheritorRenamer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticInheritorRenamer.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.psi.PsiElement import com.intellij.psi.PsiNamedElement import com.intellij.psi.search.searches.ClassInheritorsSearch @@ -51,17 +51,17 @@ class AutomaticInheritorRenamer(klass: KtClass, newName: String): AutomaticRenam override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?, allRenames: MutableMap?) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt index 2345592b1b5..f1937154f2a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.util.Key import com.intellij.psi.PsiElement import com.intellij.refactoring.JavaRefactoringSettings @@ -64,17 +64,17 @@ class AutomaticOverloadsRenamer(function: KtNamedFunction, newName: String) : Au override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?, allRenames: MutableMap?) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticParameterRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticParameterRenamer.kt index 3a35c48bfd1..b0d8b922296 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticParameterRenamer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticParameterRenamer.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.PsiNamedElement @@ -68,17 +68,17 @@ class AutomaticParameterRenamer(element: KtParameter, newName: String) : Automat override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?, allRenames: MutableMap?) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt index d652c12839b..d4e1dad5b72 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiClass @@ -132,17 +132,17 @@ class AutomaticVariableRenamer( override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun findUsages(result: MutableList?, searchInStringsAndComments: Boolean, searchInNonJavaFiles: Boolean, unresolvedUsages: MutableList?, allRenames: MutableMap?) { super.findUsages(result, searchInStringsAndComments, searchInNonJavaFiles, unresolvedUsages, allRenames) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } 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 524f6a3ab45..d92cdb1ae0d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.command.impl.StartMarkAction import com.intellij.openapi.editor.Editor @@ -61,12 +61,12 @@ class JavaMemberByKotlinReferenceInplaceRenameHandler : MemberInplaceRenameHandl override fun invoke(project: Project, elements: Array, dataContext: DataContext) { super.invoke(project, elements, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, 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 efe17f95b87..a18226b34cd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.PsiReference @@ -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 - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, 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 d05fd7a78ef..16fc5c61375 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project @@ -31,12 +31,12 @@ 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) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) } override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinMemberInplaceRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinMemberInplaceRenameHandler.kt index 50a6485e5ac..497b8b20f9c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinMemberInplaceRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinMemberInplaceRenameHandler.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.lang.Language import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor @@ -93,11 +93,11 @@ class KotlinMemberInplaceRenameHandler : MemberInplaceRenameHandler() { override fun invoke(project: Project, elements: Array, dataContext: DataContext) { super.invoke(project, elements, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) } override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt index 7a95d711753..0d6e76ef7ee 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor import com.intellij.openapi.extensions.ExtensionPointName @@ -49,11 +49,11 @@ class KotlinRenameDispatcherHandler : RenameHandler { override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) { getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext) { getRenameHandler(dataContext)?.invoke(project, elements, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 index 1ae7f6527b3..f96c70c8068 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinRenameDispatcherHandler.kt.181 @@ -26,7 +26,7 @@ import com.intellij.psi.PsiFile import com.intellij.refactoring.rename.RenameHandler import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.util.* -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger class KotlinRenameDispatcherHandler : RenameHandler { @@ -49,11 +49,11 @@ class KotlinRenameDispatcherHandler : RenameHandler { override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { getRenameHandler(dataContext)?.invoke(project, elements, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt index e06239f6176..298aa0c7961 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project @@ -75,11 +75,11 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() { override fun invoke(project: Project, elements: Array, dataContext: DataContext) { super.invoke(project, elements, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 index d298a9da1af..2738a524c21 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinVariableInplaceRenameHandler.kt.181 @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project @@ -75,11 +75,11 @@ open class KotlinVariableInplaceRenameHandler : VariableInplaceRenameHandler() { override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext) { getRenameHandler(dataContext)?.invoke(project, editor, file, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext) { getRenameHandler(dataContext)?.invoke(project, elements, dataContext) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt index 30e14de5292..56d5e4d994c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor @@ -77,11 +77,11 @@ class RenameJvmNameHandler : PsiElementRenameHandler() { override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext) { super.invoke(project, editor, file, wrapDataContext(dataContext) ?: return) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext) { super.invoke(project, elements, wrapDataContext(dataContext) ?: return) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } 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 27ed8fa3409..aeb3d751ae6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.fileTypes.FileTypeManager import com.intellij.openapi.module.ModuleUtilCore import com.intellij.psi.JavaPsiFacade @@ -69,13 +69,13 @@ class RenameKotlinFileProcessor : RenamePsiFileProcessor() { override fun findReferences(element: PsiElement): MutableCollection { return super.findReferences(element).also { - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } override fun findReferences(element: PsiElement, searchInCommentsAndStrings: Boolean): MutableCollection { return super.findReferences(element, searchInCommentsAndStrings).also { - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, 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 d95d859066f..529e0f4ea4c 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,7 +30,7 @@ import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger class RenameKotlinFileProcessor : RenamePsiFileProcessor() { class FileRenamingPsiClassWrapper( @@ -67,13 +67,13 @@ class RenameKotlinFileProcessor : RenamePsiFileProcessor() { } override fun findReferences(element: PsiElement): MutableCollection { return super.findReferences(element).also { - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } } override fun findReferences(element: PsiElement, searchInCommentsAndStrings: Boolean): MutableCollection { return super.findReferences(element, searchInCommentsAndStrings).also { - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, 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 b02438f8b1f..2efa3b9805c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.util.Key import com.intellij.psi.* import com.intellij.psi.search.SearchScope @@ -69,7 +69,7 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() { override fun canProcessElement(element: PsiElement): Boolean = element is KtNamedDeclaration override fun findReferences(element: PsiElement): Collection { - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) val searchParameters = KotlinReferencesSearchParameters( element, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 index 6128bf1ab9b..cc19aa554c2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 @@ -42,13 +42,13 @@ import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() { override fun canProcessElement(element: PsiElement): Boolean = element is KtNamedDeclaration override fun findReferences(element: PsiElement): Collection { - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this.javaClass.simpleName) val searchParameters = KotlinReferencesSearchParameters( element, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt index e9067fab7ce..6b794a2e1dc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor @@ -46,7 +46,7 @@ class RenameOnSecondaryConstructorHandler : RenameHandler { override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to secondary constructors", "Rename", null) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { 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 3cca678c158..b1d552b430d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor @@ -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) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 index 16d9c721aff..b164c7a4a90 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger +import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor @@ -32,7 +32,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) - FUSApplicationUsageTrigger.getInstance().trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) + KotlinStatisticsTrigger.trigger(KotlinIdeRefactoringTrigger::class.java, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { diff --git a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt index 20b1b1c3764..ccd570eb1d2 100644 --- a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt +++ b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt @@ -72,6 +72,6 @@ public class KotlinVersion(val major: Int, val minor: Int, val patch: Int) : Com * Returns the current version of the Kotlin standard library. */ @kotlin.jvm.JvmField - public val CURRENT: KotlinVersion = KotlinVersion(1, 3, 0) // value is written here automatically during build + public val CURRENT: KotlinVersion = KotlinVersion(1, 3, 115) // value is written here automatically during build } } diff --git a/usage-statistics/src/main/kotlin/ProjectScopeStatsReporters.kt b/usage-statistics/src/main/kotlin/ProjectScopeStatsReporters.kt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt index 7bf8c44bf1a..1431cb1bde0 100644 --- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt +++ b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt @@ -6,9 +6,16 @@ package org.jetbrains.kotlin.statistics import com.intellij.internal.statistic.service.fus.collectors.ApplicationUsageTriggerCollector +import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger open class KotlinStatisticsTrigger(private val groupIdSufix: String) : ApplicationUsageTriggerCollector() { override fun getGroupId() = "statistics.kotlin.$groupIdSufix" + + companion object { + public fun trigger(clazz: Class, event: String) { + FUSApplicationUsageTrigger.getInstance().trigger(clazz, event) + } + } } open class KotlinIdeStatisticsTrigger(groupIdSufix: String) : KotlinStatisticsTrigger("ide.$groupIdSufix") diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181 b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181 new file mode 100644 index 00000000000..9745f7fecb2 --- /dev/null +++ b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181 @@ -0,0 +1,38 @@ +/* + * Copyright 2010-2018 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.statistics + +open class KotlinStatisticsTrigger(private val groupIdSufix: String) { + companion object { + public fun trigger(clazz: Class, event: String) { + // FUS is not working for 181 + } + } +} + +open class KotlinIdeStatisticsTrigger(groupIdSufix: String) : KotlinStatisticsTrigger("ide.$groupIdSufix") + +open class KotlinGradlePluginStatisticsTrigger(groupIdSufix: String) : KotlinStatisticsTrigger("gradle.$groupIdSufix") + +class KotlinVersionTrigger : KotlinGradlePluginStatisticsTrigger("kotlin_version") + +class KotlinTargetTrigger : KotlinGradlePluginStatisticsTrigger("target") + +class KotlinProjectLibraryUsageTrigger : KotlinGradlePluginStatisticsTrigger("library") + +open class KotlinIdeActionTrigger(groupIdSufix: String? = null) : KotlinIdeStatisticsTrigger("action" + (if (groupIdSufix != null) ".$groupIdSufix" else "")) + +class KotlinIdeUndoTrigger : KotlinIdeActionTrigger("undo") + +class KotlinIdeQuickfixTrigger : KotlinIdeActionTrigger("quickfix") + +class KotlinIdeRefactoringTrigger : KotlinIdeActionTrigger("refactoring") + +class KotlinIdeIntentionTrigger : KotlinIdeActionTrigger("intention") + +class KotlinIdeInspectionTrigger : KotlinIdeActionTrigger("inspection") + +class KotlinIdeExceptionTrigger : KotlinIdeStatisticsTrigger("exception") \ No newline at end of file