From 15fec50a0fdffbf6e64e75753caad91f14b4480b Mon Sep 17 00:00:00 2001 From: Vadim Brilyantov Date: Wed, 12 Dec 2018 15:08:58 +0300 Subject: [PATCH] remove intensions and quickfixes triggers (already present in Idea) --- .../kotlin/idea/intentions/SelfTargetingIntention.kt | 6 ------ .../jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt | 6 ------ .../kotlin/idea/quickfix/QuickFixWithDelegateFactory.kt | 7 ------- .../quickfix/crossLanguage/KotlinElementActionsFactory.kt | 7 ------- 4 files changed, 26 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt index 31e3c693ce4..72b0f0de1bc 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.intentions import com.intellij.codeInsight.FileModificationService import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInspection.IntentionWrapper -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project @@ -34,7 +33,6 @@ import org.jetbrains.kotlin.psi.KtBlockExpression import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.psiUtil.containsInside import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf -import org.jetbrains.kotlin.statistics.KotlinIdeIntentionTrigger @Suppress("EqualsOrHashCode") abstract class SelfTargetingIntention( @@ -103,10 +101,6 @@ abstract class SelfTargetingIntention( final override fun invoke(project: Project, editor: Editor?, file: PsiFile) { editor ?: return - FUSApplicationUsageTrigger.getInstance().trigger( - KotlinIdeIntentionTrigger::class.java, - this::class.java.simpleName - ) PsiDocumentManager.getInstance(project).commitAllDocuments() val target = getTarget(editor, file) ?: return if (!FileModificationService.getInstance().preparePsiElementForWrite(target)) return diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt index 7ce75d9ea9d..20b88d006c6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt @@ -17,13 +17,11 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.FileModificationService -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.statistics.KotlinIdeQuickfixTrigger abstract class KotlinQuickFixAction(element: T) : QuickFixActionBase(element) { protected open fun isAvailable(project: Project, editor: Editor?, file: KtFile) = true @@ -36,10 +34,6 @@ abstract class KotlinQuickFixAction(element: T) : QuickFixAc final override fun invoke(project: Project, editor: Editor?, file: PsiFile) { val element = element ?: return if (file is KtFile && FileModificationService.getInstance().prepareFileForWrite(element.containingFile)) { - FUSApplicationUsageTrigger.getInstance().trigger( - KotlinIdeQuickfixTrigger::class.java, - this::class.java.simpleName - ) invoke(project, editor, file) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixWithDelegateFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixWithDelegateFactory.kt index 05cd19af6cf..7dc3a5b7320 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixWithDelegateFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixWithDelegateFactory.kt @@ -20,11 +20,9 @@ import com.intellij.codeInsight.FileModificationService import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInsight.intention.LowPriorityAction -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiFile -import org.jetbrains.kotlin.statistics.KotlinIdeQuickfixTrigger open class QuickFixWithDelegateFactory( private val delegateFactory: () -> IntentionAction? @@ -56,11 +54,6 @@ open class QuickFixWithDelegateFactory( return } - FUSApplicationUsageTrigger.getInstance().trigger( - KotlinIdeQuickfixTrigger::class.java, - this::class.java.simpleName - ) - val action = delegateFactory() ?: return assert(action.detectPriority() == this.detectPriority()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt index d92c798e1c4..675d1a50e76 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/crossLanguage/KotlinElementActionsFactory.kt @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.quickfix.crossLanguage import com.intellij.codeInsight.daemon.QuickFixBundle import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInsight.intention.QuickFixFactory -import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger import com.intellij.lang.java.beans.PropertyKind import com.intellij.lang.jvm.* import com.intellij.lang.jvm.actions.* @@ -73,7 +72,6 @@ import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType import org.jetbrains.kotlin.resolve.annotations.JVM_STATIC_ANNOTATION_FQ_NAME import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform -import org.jetbrains.kotlin.statistics.KotlinIdeIntentionTrigger import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.Variance @@ -472,11 +470,6 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() { override fun invoke(project: Project, editor: Editor?, file: PsiFile?) { - FUSApplicationUsageTrigger.getInstance().trigger( - KotlinIdeIntentionTrigger::class.java, - this::class.java.simpleName - ) - val target = pointer.element ?: return val kotlinAnnotation = JavaPsiFacade.getInstance(project).findClass( request.qualifiedName,