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

extract light method object: invoke on expressions

Browse Source
This commit is contained in:
Anna Kozlova
2014-09-10 21:57:43 +04:00
parent d9b93231a2
commit 1304e452d9
3 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
+5 -6
View File
@@ -79,7 +79,7 @@ public class ExtractLightMethodObjectHandler {
final PsiFile file,
@NotNull final PsiCodeFragment fragment,
final String methodName) throws PrepareFailedException {
final PsiElement[] elements = fragment.getChildren();
final PsiElement[] elements = CodeInsightUtil.findStatementsInRange(fragment, 0, fragment.getTextLength());
if (elements.length == 0) {
return null;
}
@@ -96,12 +96,11 @@ public class ExtractLightMethodObjectHandler {
CodeInsightUtil.findElementInRange(copy, range.getStartOffset(), range.getEndOffset(), originalContext.getClass());
//todo before this or super, not found etc
final PsiElement anchor = RefactoringUtil.getParentStatement(originalAnchor, false);
final PsiElement[] elementsCopy = new PsiElement[elements.length];
final PsiElement container = anchor.getParent();
elementsCopy[0] = container.addRangeBefore(elements[0], elements[elements.length - 1], anchor);
for (int i = 1; i < elements.length; i++) {
elementsCopy[i] = elementsCopy[i - 1].getNextSibling();
}
final PsiElement firstElementCopy = container.addRangeBefore(elements[0], elements[elements.length - 1], anchor);
final PsiElement[] elementsCopy = CodeInsightUtil.findStatementsInRange(copy,
firstElementCopy.getTextRange().getStartOffset(),
anchor.getTextRange().getStartOffset());
final int start = elementsCopy[0].getTextRange().getStartOffset();