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

IDEA-177288 Compiling evaluator fails inside single expression ifs or loops

Browse Source
This commit is contained in:
Egor.Ushakov
2017-08-08 20:06:35 +03:00
parent 8ea94f69c5
commit 40c3a81835
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
+12 -1
View File
@@ -133,7 +133,7 @@ public class ExtractLightMethodObjectHandler {
}
}
final PsiElement container;
PsiElement container;
if (anchor == null) {
container = ((PsiClassInitializer)containingClass.add(elementFactory.createClassInitializer())).getBody();
anchor = container.getLastChild();
@@ -142,6 +142,17 @@ public class ExtractLightMethodObjectHandler {
container = anchor.getParent();
}
// add code blocks for ifs and loops if needed
if (anchor instanceof PsiStatement && RefactoringUtil.isLoopOrIf(container)) {
PsiBlockStatement codeBlockStatement =
(PsiBlockStatement)JavaPsiFacade.getElementFactory(project).createStatementFromText("{}", container);
codeBlockStatement.getCodeBlock().add(anchor);
PsiCodeBlock codeBlock = ((PsiBlockStatement)anchor.replace(codeBlockStatement)).getCodeBlock();
anchor = codeBlock.getStatements()[0];
originalAnchor = anchor;
container = codeBlock;
}
final PsiElement firstElementCopy = container.addRangeBefore(elements[0], elements[elements.length - 1], anchor);
final PsiElement[] elementsCopy = CodeInsightUtil.findStatementsInRange(copy,
firstElementCopy.getTextRange().getStartOffset(),