IDEA-152313 (Structural replace with local variable definition leads to inconsistent state with IDEA error highlighter)

This commit is contained in:
Bas Leijdekkers
2016-03-05 11:46:14 +01:00
parent 18eef73ead
commit 50e7b23972
@@ -110,13 +110,11 @@ public class JavaReplaceHandler extends StructuralReplaceHandler {
replacement = ((PsiExpressionStatement)replacement).getExpression();
}
else if (replacement instanceof PsiDeclarationStatement &&
((PsiDeclarationStatement)replacement).getDeclaredElements().length == 1
) {
((PsiDeclarationStatement)replacement).getDeclaredElements().length == 1 &&
(elementToReplace instanceof PsiVariable || elementToReplace instanceof PsiClass)) {
return ((PsiDeclarationStatement)replacement).getDeclaredElements()[0];
}
else if (replacement instanceof PsiBlockStatement &&
elementToReplace instanceof PsiCodeBlock
) {
else if (replacement instanceof PsiBlockStatement && elementToReplace instanceof PsiCodeBlock) {
return ((PsiBlockStatement)replacement).getCodeBlock();
}