MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

create switch intention cleanup

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-06-05 20:06:31 +03:00
parent db26e06168
commit 4f2dafb7ce
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSwitchIntention.java
+12 -12
View File
@@ -33,40 +33,40 @@ public class CreateSwitchIntention extends BaseElementAtCaretIntentionAction {
public static final String TEXT = "Create switch statement";
@Override
public void invoke(@NotNull final Project project, final Editor editor, @NotNull final PsiElement element) throws IncorrectOperationException {
final PsiExpressionStatement expressionStatement = resolveExpressionStatement(element);
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiSwitchStatement switchStatement = (PsiSwitchStatement)elementFactory
.createStatementFromText(String.format("switch (%s) {}", expressionStatement.getExpression().getText()), null);
public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
PsiExpressionStatement expressionStatement = resolveExpressionStatement(element);
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
String valueToSwitch = expressionStatement.getExpression().getText();
PsiSwitchStatement switchStatement = (PsiSwitchStatement)elementFactory.createStatementFromText("switch (" + valueToSwitch + ") {}", null);
switchStatement = (PsiSwitchStatement)expressionStatement.replace(switchStatement);
CodeStyleManager.getInstance(project).reformat(switchStatement);
final PsiJavaToken lBrace = switchStatement.getBody().getLBrace();
PsiJavaToken lBrace = switchStatement.getBody().getLBrace();
editor.getCaretModel().moveToOffset(lBrace.getTextOffset() + lBrace.getTextLength());
}
@Override
public boolean isAvailable(@NotNull final Project project, final Editor editor, @NotNull final PsiElement element) {
final PsiExpressionStatement expressionStatement = resolveExpressionStatement(element);
public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
PsiExpressionStatement expressionStatement = resolveExpressionStatement(element);
return expressionStatement != null && isValidTypeForSwitch(expressionStatement.getExpression().getType(), expressionStatement);
}
private static PsiExpressionStatement resolveExpressionStatement(final PsiElement element) {
private static PsiExpressionStatement resolveExpressionStatement(PsiElement element) {
if (element instanceof PsiExpressionStatement) {
return (PsiExpressionStatement)element;
} else {
final PsiStatement psiStatement = PsiTreeUtil.getParentOfType(element, PsiStatement.class);
PsiStatement psiStatement = PsiTreeUtil.getParentOfType(element, PsiStatement.class);
return psiStatement instanceof PsiExpressionStatement ? (PsiExpressionStatement)psiStatement : null;
}
}
private static boolean isValidTypeForSwitch(@Nullable final PsiType type, final PsiElement context) {
private static boolean isValidTypeForSwitch(@Nullable PsiType type, PsiElement context) {
if (type == null) {
return false;
}
if (type instanceof PsiClassType) {
final PsiClass resolvedClass = ((PsiClassType)type).resolve();
PsiClass resolvedClass = ((PsiClassType)type).resolve();
if (resolvedClass == null) {
return false;
}