MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

introduce variable: fix broken formatting, add test, set explicit caret position after refactoring, cleanup

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-05-13 20:51:53 +04:00
parent 1b335b4a16
commit b4b09995ff
7 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
python/src/com/jetbrains/python/refactoring/introduce/IntroduceHandler.java
View File

@@ -1,5 +1,6 @@
package com.jetbrains.python.refactoring.introduce;
import com.intellij.codeInsight.CodeInsightUtilBase;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
@@ -39,7 +40,7 @@ abstract public class IntroduceHandler implements RefactoringActionHandler {
PyExpressionStatement statement = PsiTreeUtil.getParentOfType(expression, PyExpressionStatement.class);
if (statement != null) {
if (statement.getExpression() == expression) {
expression.delete();
statement.delete();
return;
}
}
@@ -85,7 +86,7 @@ abstract public class IntroduceHandler implements RefactoringActionHandler {
return ArrayUtil.toStringArray(res);
}
protected void performAction(@NotNull final Project project, Editor editor, PsiFile file, String name, boolean replaceAll, boolean hasConstructor) {
public void performAction(@NotNull final Project project, Editor editor, PsiFile file, String name, boolean replaceAll, boolean hasConstructor) {
if (!CommonRefactoringUtil.checkReadOnlyStatus(file)) {
return;
}
@@ -145,10 +146,13 @@ abstract public class IntroduceHandler implements RefactoringActionHandler {
initInConstructor = dialog.initInConstructor();
}
String assignmentText = name + " = " + expression.getText();
final PyAssignmentStatement declaration = createDeclaration(project, assignmentText);
PyAssignmentStatement declaration = createDeclaration(project, assignmentText);
assert name != null;
performReplace(project, declaration, expression, occurrences, name, replaceAll, initInConstructor);
declaration = performReplace(project, declaration, expression, occurrences, name, replaceAll, initInConstructor);
declaration = CodeInsightUtilBase.forcePsiPostprocessAndRestoreElement(declaration);
editor.getCaretModel().moveToOffset(declaration.getTextRange().getEndOffset());
editor.getSelectionModel().removeSelection();
}
protected abstract String getHelpId();
@@ -172,24 +176,24 @@ abstract public class IntroduceHandler implements RefactoringActionHandler {
return PyRefactoringUtil.getOccurences(expression, context);
}
private void performReplace(@NotNull final Project project,
@NotNull final PyAssignmentStatement declaration,
@NotNull final PsiElement expression,
@NotNull final List<PsiElement> occurrences,
@NotNull final String name,
final boolean replaceAll,
final boolean initInConstructor) {
new WriteCommandAction(project, expression.getContainingFile()) {
protected void run(final Result result) throws Throwable {
private PyAssignmentStatement performReplace(@NotNull final Project project,
@NotNull final PyAssignmentStatement declaration,
@NotNull final PsiElement expression,
@NotNull final List<PsiElement> occurrences,
@NotNull final String name,
final boolean replaceAll,
final boolean initInConstructor) {
return new WriteCommandAction<PyAssignmentStatement>(project, expression.getContainingFile()) {
protected void run(final Result<PyAssignmentStatement> result) throws Throwable {
final Pair<PsiElement, TextRange> data = expression.getUserData(PyPsiUtils.SELECTION_BREAKS_AST_NODE);
if (data == null) {
addDeclaration(expression, declaration, occurrences, replaceAll, initInConstructor);
result.setResult((PyAssignmentStatement)addDeclaration(expression, declaration, occurrences, replaceAll, initInConstructor));
}
else {
addDeclaration(data.first, declaration, occurrences, replaceAll, initInConstructor);
result.setResult((PyAssignmentStatement)addDeclaration(data.first, declaration, occurrences, replaceAll, initInConstructor));
}
PyExpression newExpression = createExpression(project, name, declaration).getExpression();
PyExpression newExpression = createExpression(project, name, declaration);
if (replaceAll) {
for (PsiElement occurrence : occurrences) {
@@ -200,11 +204,11 @@ abstract public class IntroduceHandler implements RefactoringActionHandler {
replaceExpression(newExpression, project, expression);
}
}
}.execute();
}.execute().getResultObject();
}
protected PyExpressionStatement createExpression(Project project, String name, PyAssignmentStatement declaration) {
return PyElementGenerator.getInstance(project).createFromText(PyExpressionStatement.class, name);
protected PyExpression createExpression(Project project, String name, PyAssignmentStatement declaration) {
return PyElementGenerator.getInstance(project).createExpressionFromText(name);
}
@Nullable

4
python/src/com/jetbrains/python/refactoring/introduce/field/FieldIntroduceHandler.java
View File

@@ -60,10 +60,10 @@ public class FieldIntroduceHandler extends IntroduceHandler {
}
@Override
protected PyExpressionStatement createExpression(Project project, String name, PyAssignmentStatement declaration) {
protected PyExpression createExpression(Project project, String name, PyAssignmentStatement declaration) {
final String text = declaration.getText();
final String self_name = text.substring(0, text.indexOf('.'));
return PyElementGenerator.getInstance(project).createFromText(PyExpressionStatement.class, self_name + "." + name);
return PyElementGenerator.getInstance(project).createExpressionFromText(self_name + "." + name);
}
@Override

3
python/src/com/jetbrains/python/refactoring/introduce/variable/VariableIntroduceHandler.java
View File

@@ -36,8 +36,7 @@ public class VariableIntroduceHandler extends IntroduceHandler {
PsiElement anchor = replaceAll ? findAnchor(occurrences) : PsiTreeUtil.getParentOfType(expression, PyStatement.class);
assert anchor != null;
final PsiElement parent = anchor.getParent();
parent.addBefore(declaration, anchor);
return parent.getParent();
return parent.addBefore(declaration, anchor);
}
private static PsiElement findAnchor(List<PsiElement> occurrences) {

3
python/testData/refactoring/introduceVariable/simple.after.py Normal file
View File

@@ -0,0 +1,3 @@
def foo():
a = 1<caret>
print "fooo"

3
python/testData/refactoring/introduceVariable/simple.py Normal file
View File

@@ -0,0 +1,3 @@
def foo():
<selection>1</selection>
print "fooo"

8
python/testSrc/com/jetbrains/python/PythonAllTestsSuite.java
View File

@@ -1,9 +1,6 @@
package com.jetbrains.python;
import com.jetbrains.python.refactoring.PyCodeFragmentTest;
import com.jetbrains.python.refactoring.PyExtractMethodTest;
import com.jetbrains.python.refactoring.PyInlineLocalTest;
import com.jetbrains.python.refactoring.PyRenameTest;
import com.jetbrains.python.refactoring.*;
import com.jetbrains.python.refactoring.classes.PyExtractSuperclassTest;
import com.jetbrains.python.refactoring.classes.PyPullUpTest;
import com.jetbrains.python.refactoring.classes.PyPushDownTest;
@@ -56,7 +53,8 @@ public class PythonAllTestsSuite {
PyCodeFragmentTest.class,
PyOptimizeImportsTest.class,
PySmartEnterTest.class,
PyStatementMoverTest.class
PyStatementMoverTest.class,
PyIntroduceVariableTest.class
};
public static TestSuite suite() {

21
python/testSrc/com/jetbrains/python/refactoring/PyIntroduceVariableTest.java Normal file
View File

@@ -0,0 +1,21 @@
package com.jetbrains.python.refactoring;
import com.jetbrains.python.fixtures.PyLightFixtureTestCase;
import com.jetbrains.python.refactoring.introduce.variable.VariableIntroduceHandler;
/**
* @author yole
*/
public class PyIntroduceVariableTest extends PyLightFixtureTestCase {
@Override
protected String getTestDataPath() {
return super.getTestDataPath() + "/refactoring/introduceVariable";
}
public void testSimple() throws Exception {
myFixture.configureByFile("simple.py");
VariableIntroduceHandler handler = new VariableIntroduceHandler();
handler.performAction(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile(), "a", true, false);
myFixture.checkResultByFile("simple.after.py");
}
}