[jvm-lang] extract check if new actions are enabled

This commit is contained in:
Daniil Ovchinnikov
2017-08-31 15:41:14 +03:00
parent efcb7adbe1
commit a4b3f31ebe
2 changed files with 6 additions and 3 deletions
@@ -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<JvmElementActionsFactory>("com.intellij.lang.jvm.actions.jvmElementActionsFactory")
@@ -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<IntentionAction> createVariableActions(@NotNull PsiReferenceExpression refExpr) {
final Collection<IntentionAction> 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));