From b839e522e9baa758feea8d297d0821af0b959f12 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 31 Jan 2017 21:26:57 +0300 Subject: [PATCH] Generate equals or hash code: do not run in write action to avoid AWT events inside --- .../kotlin/idea/inspections/EqualsOrHashCodeInspection.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/EqualsOrHashCodeInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/EqualsOrHashCodeInspection.kt index bb5a9f08000..3a503a77e76 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/EqualsOrHashCodeInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/EqualsOrHashCodeInspection.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.inspections -import com.intellij.codeInsight.CodeInsightUtilBase import com.intellij.codeInsight.FileModificationService import com.intellij.codeInspection.InspectionsBundle import com.intellij.codeInspection.LocalQuickFix @@ -36,7 +35,6 @@ import org.jetbrains.kotlin.psi.KtObjectDeclaration import org.jetbrains.kotlin.psi.KtVisitorVoid import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.resolve.source.getPsi -import org.jetbrains.kotlin.types.typeUtil.supertypes object DeleteEqualsAndHashCodeFix : LocalQuickFix { override fun getName() = "Delete equals()/hashCode()" @@ -63,6 +61,8 @@ sealed class GenerateEqualsOrHashCodeFix : LocalQuickFix { override fun getFamilyName() = name + override fun startInWriteAction() = false + override fun applyFix(project: Project, descriptor: ProblemDescriptor) { if (!FileModificationService.getInstance().preparePsiElementForWrite(descriptor.psiElement)) return KotlinGenerateEqualsAndHashcodeAction().doInvoke(project, null, descriptor.psiElement.parent as KtClass)