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

extract light method object: get rid of physical copy and write action; add executed lines before 'breakpoint'; skip fields in generated out variables

Browse Source
This commit is contained in:
Anna Kozlova
2014-09-08 20:29:29 +04:00
parent cbb22b8c9f
commit 1181b95bde
3 changed files with 27 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
+24 -39
View File
@@ -25,6 +25,8 @@ import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.controlFlow.*;
import com.intellij.refactoring.extractMethod.AbstractExtractDialog;
import com.intellij.refactoring.extractMethod.InputVariables;
@@ -69,7 +71,7 @@ public class ExtractLightMethodObjectHandler {
}
final PsiFile copy = PsiFileFactory.getInstance(project)
.createFileFromText(file.getName(), file.getFileType(), file.getText(), file.getModificationStamp(), true);
.createFileFromText(file.getName(), file.getFileType(), file.getText(), file.getModificationStamp(), false);
final PsiElement originalContext = fragment.getContext();
if (originalContext == null) {
@@ -82,25 +84,24 @@ public class ExtractLightMethodObjectHandler {
final PsiElement anchor = RefactoringUtil.getParentStatement(originalAnchor, false);
final PsiElement[] elementsCopy = new PsiElement[elements.length];
final PsiElement container = anchor.getParent();
elementsCopy[0] = ApplicationManager.getApplication().runWriteAction(new Computable<PsiElement>() {
@Override
public PsiElement compute() {
return container.addRangeAfter(elements[0], elements[elements.length - 1], anchor);
}
});
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 int start = elementsCopy[0].getTextRange().getStartOffset();
final ControlFlow controlFlow;
try {
controlFlow = ControlFlowFactory.getInstance(project).getControlFlow(container, AllVariablesControlFlowPolicy.getInstance());
controlFlow = ControlFlowFactory.getInstance(project).getControlFlow(container, LocalsOrMyInstanceFieldsControlFlowPolicy.getInstance());
}
catch (AnalysisCanceledException e) {
return null;
}
final List<PsiVariable> variables = ControlFlowUtil.getUsedVariables(controlFlow, 0, controlFlow.getSize());
final List<PsiVariable> variables = ControlFlowUtil.getUsedVariables(controlFlow,
controlFlow.getStartOffset(elementsCopy[0]),
controlFlow.getEndOffset(elementsCopy[elementsCopy.length - 1]));
final String outputVariables = StringUtil.join(variables, new Function<PsiVariable, String>() {
@Override
@@ -108,43 +109,27 @@ public class ExtractLightMethodObjectHandler {
return "\"variable: \" + " + variable.getName();
}
}, " +");
final PsiStatement outStatement = JavaPsiFacade.getElementFactory(project).createStatementFromText("System.out.println(" + outputVariables + ");", anchor);
PsiStatement outStatement = JavaPsiFacade.getElementFactory(project).createStatementFromText("System.out.println(" + outputVariables + ");", anchor);
outStatement = (PsiStatement)container.addAfter(outStatement, elementsCopy[elementsCopy.length - 1]);
ApplicationManager.getApplication().runWriteAction(new Runnable() {
public void run() {
container.addAfter(outStatement, elementsCopy[elementsCopy.length - 1]);
final ExtractMethodObjectProcessor extractMethodObjectProcessor = new ExtractMethodObjectProcessor(project, null, elementsCopy, "") {
@Override
protected AbstractExtractDialog createExtractMethodObjectDialog(MyExtractMethodProcessor processor) {
return new LightExtractMethodObjectDialog(this, methodName);
}
});
};
extractMethodObjectProcessor.getExtractProcessor().setShowErrorDialogs(false);
final Document document = PsiDocumentManager.getInstance(project).getDocument(copy);
LOG.assertTrue(document != null);
ExtractMethodObjectHandler.extractMethodObject(project, null, extractMethodObjectProcessor);
final int startOffset = elementsCopy[0].getTextRange().getStartOffset();
final int endOffset = elementsCopy[elementsCopy.length - 1].getTextRange().getEndOffset();
PsiDocumentManager.getInstance(project).commitAllDocuments();
final RangeMarker callSiteMarker = document.createRangeMarker(startOffset, endOffset);
callSiteMarker.setGreedyToLeft(true);
callSiteMarker.setGreedyToRight(true);
try {
final ExtractMethodObjectProcessor extractMethodObjectProcessor = new ExtractMethodObjectProcessor(project, null, elementsCopy, "") {
@Override
protected AbstractExtractDialog createExtractMethodObjectDialog(MyExtractMethodProcessor processor) {
return new LightExtractMethodObjectDialog(this, methodName);
}
};
extractMethodObjectProcessor.getExtractProcessor().setShowErrorDialogs(false);
ExtractMethodObjectHandler.extractMethodObject(project, null, extractMethodObjectProcessor);
final String generatedCall = document.getText(new TextRange(callSiteMarker.getStartOffset(), callSiteMarker.getEndOffset()));
return new ExtractedData(generatedCall, extractMethodObjectProcessor.getInnerClass());
}
finally {
callSiteMarker.dispose();
}
final String generatedCall = copy.getText().substring(start, outStatement.getTextOffset());
return new ExtractedData(generatedCall,
(PsiClass)CodeStyleManager.getInstance(project).reformat(extractMethodObjectProcessor.getInnerClass()));
}
private static class LightExtractMethodObjectDialog implements AbstractExtractDialog {
private final ExtractMethodObjectProcessor myProcessor;
private final String myMethodName;
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class ExtractMethodObjectProcessor extends BaseRefactoringProcessor {
protected UsageInfo[] findUsages() {
final ArrayList<UsageInfo> result = new ArrayList<UsageInfo>();
final PsiClass containingClass = getMethod().getContainingClass();
final SearchScope scope = PsiUtilCore.getVirtualFile(containingClass) instanceof LightVirtualFile
final SearchScope scope = PsiUtilCore.getVirtualFile(containingClass) == null
? new LocalSearchScope(containingClass)
: GlobalSearchScope.projectScope(myProject);
PsiReference[] refs =
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java
+2 -6
View File
@@ -53,9 +53,7 @@ public class ExtractMethodObject4DebuggerTest extends LightRefactoringTestCase {
}
public void testSimpleGeneration() throws Exception {
doTest("int i = 0; int j = 0;", "Test test = new Test().invoke();\n" +
" int i = test.getI();\n" +
" int j = test.getJ();",
doTest("int i = 0; int j = 0;", "Test test = new Test().invoke();int i = test.getI();int j = test.getJ();",
"public class Test {\n" +
" private int i;\n" +
@@ -78,9 +76,7 @@ public class ExtractMethodObject4DebuggerTest extends LightRefactoringTestCase {
}
public void testInvokeReturnType() throws Exception {
doTest("x = 6; y = 6;", "Test test = new Test().invoke();\n" +
" x = test.getX();\n" +
" y = test.getY();",
doTest("x = 6; y = 6;", "Test test = new Test().invoke();x = test.getX();y = test.getY();",
"public static class Test {\n" +
" private int x;\n" +