From 567ff736fd92c514ff1c4c4a52f26b2169b8677c Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Tue, 21 May 2019 15:38:01 +0300 Subject: [PATCH] cleanup DefaultQuickFixProvider#createVariableActions GitOrigin-RevId: 26772a5f88762709b75bfcf26bc58a0cab3db46e --- .../daemon/impl/quickfix/DefaultQuickFixProvider.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 4c068079a29e..28c6be0e3240 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 @@ -89,13 +89,9 @@ public class DefaultQuickFixProvider extends UnresolvedReferenceQuickFixProvider @NotNull private static Collection createVariableActions(@NotNull PsiReferenceExpression refExpr) { - final Collection result = new ArrayList<>(); - - final JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(refExpr.getProject()); - final VariableKind kind = getKind(styleManager, refExpr); - - result.addAll(CreateFieldFromUsage.generateActions(refExpr)); + final Collection result = new ArrayList<>(CreateFieldFromUsage.generateActions(refExpr)); if (!refExpr.isQualified()) { + final VariableKind kind = getKind(refExpr); IntentionAction createLocalFix = new CreateLocalFromUsageFix(refExpr); result.add(kind == VariableKind.LOCAL_VARIABLE ? PriorityIntentionActionWrapper.highPriority(createLocalFix) : createLocalFix); IntentionAction createParameterFix = new CreateParameterFromUsageFix(refExpr); @@ -105,7 +101,8 @@ public class DefaultQuickFixProvider extends UnresolvedReferenceQuickFixProvider } @Nullable - private static VariableKind getKind(@NotNull JavaCodeStyleManager styleManager, @NotNull PsiReferenceExpression refExpr) { + private static VariableKind getKind(@NotNull PsiReferenceExpression refExpr) { + final JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(refExpr.getProject()); final String reference = refExpr.getText(); if (StringUtil.isUpperCase(reference)) {