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

fixed PY-12401 inline refactoring looses comments

Browse Source
This commit is contained in:
Ekaterina Tuzova
2014-05-14 14:13:00 +04:00
parent 51e2856c78
commit f0918e0113
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/refactoring/inline/PyInlineLocalHandler.java
+8 -1
View File
@@ -42,6 +42,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.RefactoringMessageDialog;
import com.intellij.util.Query;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.PythonLanguage;
import com.jetbrains.python.codeInsight.controlflow.ReadWriteInstruction;
import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
@@ -95,7 +96,7 @@ public class PyInlineLocalHandler extends InlineActionHandler {
invoke(project, editor, (PyTargetExpression)element, refExpr);
}
public static void invoke(final Project project, final Editor editor, PyTargetExpression local, PyReferenceExpression refExpr) {
public static void invoke(final Project project, final Editor editor, final PyTargetExpression local, PyReferenceExpression refExpr) {
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, local)) return;
final HighlightManager highlightManager = HighlightManager.getInstance(project);
@@ -187,6 +188,12 @@ public class PyInlineLocalHandler extends InlineActionHandler {
PsiElement[] exprs = new PsiElement[refsToInline.length];
final PyExpression value = prepareValue(def, localName, project);
final PyExpression withParent = PyElementGenerator.getInstance(project).createExpressionFromText("(" + value.getText() + ")");
final PsiElement lastChild = def.getLastChild();
if (lastChild != null && lastChild.getNode().getElementType() == PyTokenTypes.END_OF_LINE_COMMENT) {
final PsiElement parent = def.getParent();
if (parent != null) parent.addBefore(lastChild, def);
}
for (int i = 0, refsToInlineLength = refsToInline.length; i < refsToInlineLength; i++) {
PsiElement element = refsToInline[i];
if (PyReplaceExpressionUtil.isNeedParenthesis((PyExpression)element, value)) {
python/testData/refactoring/inlinelocal/comment.after.py
+2
View File
@@ -0,0 +1,2 @@
# some clever comment
value = "aaaaaa" + "bbbbb"
python/testData/refactoring/inlinelocal/comment.before.py
+2
View File
@@ -0,0 +1,2 @@
temp = "aaaaaa" # some clever comment
value = te<caret>mp + "bbbbb"
python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java
+4
View File
@@ -80,4 +80,8 @@ public class PyInlineLocalTest extends PyTestCase {
public void testPy5832() {
doTest();
}
public void testComment() {
doTest();
}
}