diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt index 2a5cbaf7cd2e..f164250b78c5 100644 --- a/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt +++ b/java/java-analysis-api/src/com/intellij/lang/jvm/actions/actions.kt @@ -20,7 +20,11 @@ package com.intellij.lang.jvm.actions import com.intellij.codeInsight.intention.IntentionAction import com.intellij.lang.jvm.JvmClass import com.intellij.lang.jvm.JvmModifiersOwner +import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.extensions.ExtensionPointName +import com.intellij.openapi.util.registry.Registry + +fun useInterlaguageActions(): Boolean = ApplicationManager.getApplication().isUnitTestMode || Registry.`is`("ide.interlanguage.fixes") val EP_NAME = ExtensionPointName.create("com.intellij.lang.jvm.actions.jvmElementActionsFactory") diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java index 7850d730c879..67cefaed1d41 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java @@ -22,9 +22,8 @@ import com.intellij.codeInsight.intention.QuickFixFactory; import com.intellij.codeInsight.intention.impl.PriorityIntentionActionWrapper; import com.intellij.codeInsight.quickfix.UnresolvedReferenceQuickFixProvider; import com.intellij.lang.java.request.CreateFieldFromUsage; -import com.intellij.openapi.application.ApplicationManager; +import com.intellij.lang.jvm.actions.JvmElementActionFactories; import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; @@ -94,7 +93,7 @@ public class DefaultQuickFixProvider extends UnresolvedReferenceQuickFixProvider private static Collection createVariableActions(@NotNull PsiReferenceExpression refExpr) { final Collection result = new ArrayList<>(); - if (ApplicationManager.getApplication().isUnitTestMode() || Registry.is("ide.interlanguage.fixes")) { + if (JvmElementActionFactories.useInterlaguageActions()) { result.addAll(CreateFieldFromUsage.generateActions(refExpr)); if (!refExpr.isQualified()) { result.add(new CreateLocalFromUsageFix(refExpr));