diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractIfConditionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractIfConditionAction.java index fe01746dcfc5..4328e37054fb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractIfConditionAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractIfConditionAction.java @@ -19,15 +19,12 @@ import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; -import com.intellij.psi.impl.JavaFactoryProvider; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; -import com.intellij.util.ObjectUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/resources-en/src/intentionDescriptions/ExtractIfConditionAction/after.java.template b/resources-en/src/intentionDescriptions/ExtractIfConditionAction/after.java.template new file mode 100644 index 000000000000..2b67c557f958 --- /dev/null +++ b/resources-en/src/intentionDescriptions/ExtractIfConditionAction/after.java.template @@ -0,0 +1,7 @@ +if (b && c) { + x = 1; +} else if (a) { + x = 1; +} else { + x = 2; +} \ No newline at end of file diff --git a/resources-en/src/intentionDescriptions/ExtractIfConditionAction/before.java.template b/resources-en/src/intentionDescriptions/ExtractIfConditionAction/before.java.template new file mode 100644 index 000000000000..e4884f4d6f77 --- /dev/null +++ b/resources-en/src/intentionDescriptions/ExtractIfConditionAction/before.java.template @@ -0,0 +1,5 @@ +if (a || b && c) { + x = 1; +} else { + x = 2; +} diff --git a/resources-en/src/intentionDescriptions/ExtractIfConditionAction/description.html b/resources-en/src/intentionDescriptions/ExtractIfConditionAction/description.html new file mode 100644 index 000000000000..405094f1b01d --- /dev/null +++ b/resources-en/src/intentionDescriptions/ExtractIfConditionAction/description.html @@ -0,0 +1,5 @@ + + +This intention extracts operand expression from If condition and creates new If statement with this expression as a condition, keeping the original control flow. + + \ No newline at end of file