remove intensions and quickfixes triggers (already present in Idea)
This commit is contained in:
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.intentions
|
|||||||
import com.intellij.codeInsight.FileModificationService
|
import com.intellij.codeInsight.FileModificationService
|
||||||
import com.intellij.codeInsight.intention.IntentionAction
|
import com.intellij.codeInsight.intention.IntentionAction
|
||||||
import com.intellij.codeInspection.IntentionWrapper
|
import com.intellij.codeInspection.IntentionWrapper
|
||||||
import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.project.Project
|
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.KtElement
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.containsInside
|
import org.jetbrains.kotlin.psi.psiUtil.containsInside
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
|
import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeIntentionTrigger
|
|
||||||
|
|
||||||
@Suppress("EqualsOrHashCode")
|
@Suppress("EqualsOrHashCode")
|
||||||
abstract class SelfTargetingIntention<TElement : PsiElement>(
|
abstract class SelfTargetingIntention<TElement : PsiElement>(
|
||||||
@@ -103,10 +101,6 @@ abstract class SelfTargetingIntention<TElement : PsiElement>(
|
|||||||
|
|
||||||
final override fun invoke(project: Project, editor: Editor?, file: PsiFile) {
|
final override fun invoke(project: Project, editor: Editor?, file: PsiFile) {
|
||||||
editor ?: return
|
editor ?: return
|
||||||
FUSApplicationUsageTrigger.getInstance().trigger(
|
|
||||||
KotlinIdeIntentionTrigger::class.java,
|
|
||||||
this::class.java.simpleName
|
|
||||||
)
|
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
val target = getTarget(editor, file) ?: return
|
val target = getTarget(editor, file) ?: return
|
||||||
if (!FileModificationService.getInstance().preparePsiElementForWrite(target)) return
|
if (!FileModificationService.getInstance().preparePsiElementForWrite(target)) return
|
||||||
|
|||||||
@@ -17,13 +17,11 @@
|
|||||||
package org.jetbrains.kotlin.idea.quickfix
|
package org.jetbrains.kotlin.idea.quickfix
|
||||||
|
|
||||||
import com.intellij.codeInsight.FileModificationService
|
import com.intellij.codeInsight.FileModificationService
|
||||||
import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger
|
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeQuickfixTrigger
|
|
||||||
|
|
||||||
abstract class KotlinQuickFixAction<out T : PsiElement>(element: T) : QuickFixActionBase<T>(element) {
|
abstract class KotlinQuickFixAction<out T : PsiElement>(element: T) : QuickFixActionBase<T>(element) {
|
||||||
protected open fun isAvailable(project: Project, editor: Editor?, file: KtFile) = true
|
protected open fun isAvailable(project: Project, editor: Editor?, file: KtFile) = true
|
||||||
@@ -36,10 +34,6 @@ abstract class KotlinQuickFixAction<out T : PsiElement>(element: T) : QuickFixAc
|
|||||||
final override fun invoke(project: Project, editor: Editor?, file: PsiFile) {
|
final override fun invoke(project: Project, editor: Editor?, file: PsiFile) {
|
||||||
val element = element ?: return
|
val element = element ?: return
|
||||||
if (file is KtFile && FileModificationService.getInstance().prepareFileForWrite(element.containingFile)) {
|
if (file is KtFile && FileModificationService.getInstance().prepareFileForWrite(element.containingFile)) {
|
||||||
FUSApplicationUsageTrigger.getInstance().trigger(
|
|
||||||
KotlinIdeQuickfixTrigger::class.java,
|
|
||||||
this::class.java.simpleName
|
|
||||||
)
|
|
||||||
invoke(project, editor, file)
|
invoke(project, editor, file)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,11 +20,9 @@ import com.intellij.codeInsight.FileModificationService
|
|||||||
import com.intellij.codeInsight.intention.HighPriorityAction
|
import com.intellij.codeInsight.intention.HighPriorityAction
|
||||||
import com.intellij.codeInsight.intention.IntentionAction
|
import com.intellij.codeInsight.intention.IntentionAction
|
||||||
import com.intellij.codeInsight.intention.LowPriorityAction
|
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.editor.Editor
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeQuickfixTrigger
|
|
||||||
|
|
||||||
open class QuickFixWithDelegateFactory(
|
open class QuickFixWithDelegateFactory(
|
||||||
private val delegateFactory: () -> IntentionAction?
|
private val delegateFactory: () -> IntentionAction?
|
||||||
@@ -56,11 +54,6 @@ open class QuickFixWithDelegateFactory(
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
FUSApplicationUsageTrigger.getInstance().trigger(
|
|
||||||
KotlinIdeQuickfixTrigger::class.java,
|
|
||||||
this::class.java.simpleName
|
|
||||||
)
|
|
||||||
|
|
||||||
val action = delegateFactory() ?: return
|
val action = delegateFactory() ?: return
|
||||||
|
|
||||||
assert(action.detectPriority() == this.detectPriority()) {
|
assert(action.detectPriority() == this.detectPriority()) {
|
||||||
|
|||||||
-7
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.quickfix.crossLanguage
|
|||||||
import com.intellij.codeInsight.daemon.QuickFixBundle
|
import com.intellij.codeInsight.daemon.QuickFixBundle
|
||||||
import com.intellij.codeInsight.intention.IntentionAction
|
import com.intellij.codeInsight.intention.IntentionAction
|
||||||
import com.intellij.codeInsight.intention.QuickFixFactory
|
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.java.beans.PropertyKind
|
||||||
import com.intellij.lang.jvm.*
|
import com.intellij.lang.jvm.*
|
||||||
import com.intellij.lang.jvm.actions.*
|
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.psi.psiUtil.visibilityModifierType
|
||||||
import org.jetbrains.kotlin.resolve.annotations.JVM_STATIC_ANNOTATION_FQ_NAME
|
import org.jetbrains.kotlin.resolve.annotations.JVM_STATIC_ANNOTATION_FQ_NAME
|
||||||
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
||||||
import org.jetbrains.kotlin.statistics.KotlinIdeIntentionTrigger
|
|
||||||
import org.jetbrains.kotlin.storage.LockBasedStorageManager
|
import org.jetbrains.kotlin.storage.LockBasedStorageManager
|
||||||
import org.jetbrains.kotlin.types.KotlinType
|
import org.jetbrains.kotlin.types.KotlinType
|
||||||
import org.jetbrains.kotlin.types.Variance
|
import org.jetbrains.kotlin.types.Variance
|
||||||
@@ -472,11 +470,6 @@ class KotlinElementActionsFactory : JvmElementActionsFactory() {
|
|||||||
|
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?) {
|
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 target = pointer.element ?: return
|
||||||
val kotlinAnnotation = JavaPsiFacade.getInstance(project).findClass(
|
val kotlinAnnotation = JavaPsiFacade.getInstance(project).findClass(
|
||||||
request.qualifiedName,
|
request.qualifiedName,
|
||||||
|
|||||||
Reference in New Issue
Block a user