From e636aacf4bc86ac8a97241afc776d3f3af75bce4 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 19 Dec 2014 11:36:39 +0100 Subject: [PATCH] expr lambda -> block: ensure reformat --- .../ipp/types/ExpandOneLineLambda2CodeBlockIntention.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ExpandOneLineLambda2CodeBlockIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ExpandOneLineLambda2CodeBlockIntention.java index 72e5dfd91181..0a3a0beafbc2 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ExpandOneLineLambda2CodeBlockIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ExpandOneLineLambda2CodeBlockIntention.java @@ -17,6 +17,7 @@ package com.siyeh.ipp.types; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; +import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import com.siyeh.ipp.base.Intention; @@ -50,7 +51,7 @@ public class ExpandOneLineLambda2CodeBlockIntention extends Intention { final String resultedLambdaText = lambdaExpression.getParameterList().getText() + "->" + blockText; final PsiExpression expressionFromText = JavaPsiFacade.getElementFactory(element.getProject()).createExpressionFromText(resultedLambdaText, lambdaExpression); - lambdaExpression.replace(expressionFromText); + CodeStyleManager.getInstance(element.getProject()).reformat(lambdaExpression.replace(expressionFromText)); } @@ -59,10 +60,7 @@ public class ExpandOneLineLambda2CodeBlockIntention extends Intention { @Override public boolean satisfiedBy(PsiElement element) { final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(element, PsiLambdaExpression.class); - if (lambdaExpression != null) { - return lambdaExpression.getBody() instanceof PsiExpression; - } - return false; + return lambdaExpression != null && lambdaExpression.getBody() instanceof PsiExpression; } } }