From cd1889b6ba5f29de514b62ac6ad040fec6c33479 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Fri, 17 Dec 2010 11:39:29 +0300 Subject: [PATCH] fixed PY-2518 Join 2 ifs: merge comments if both presented --- .../intentions/PyConvertLambdaToFunctionIntention.java | 2 -- .../python/codeInsight/intentions/PyJoinIfIntention.java | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertLambdaToFunctionIntention.java b/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertLambdaToFunctionIntention.java index 921b09624481..2797a11f39fe 100644 --- a/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertLambdaToFunctionIntention.java +++ b/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertLambdaToFunctionIntention.java @@ -59,8 +59,6 @@ public class PyConvertLambdaToFunctionIntention extends BaseIntentionAction { functionBuilder.statement("return " + body.getText()); PyFunction function = functionBuilder.buildFunction(project); - - PyFunction parentFunction = PsiTreeUtil.getTopmostParentOfType(lambdaExpression, PyFunction.class); if (parentFunction != null ) { PyClass parentClass = PsiTreeUtil.getTopmostParentOfType(parentFunction, PyClass.class); diff --git a/python/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java b/python/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java index 42636f1f993f..0bf11d123288 100644 --- a/python/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java +++ b/python/src/com/jetbrains/python/codeInsight/intentions/PyJoinIfIntention.java @@ -75,12 +75,13 @@ public class PyJoinIfIntention extends BaseIntentionAction { List comments = PsiTreeUtil.getChildrenOfTypeAsList(ifStatement.getIfPart(), PsiComment.class); comments.addAll(PsiTreeUtil.getChildrenOfTypeAsList(((PyIfStatement)firstStatement).getIfPart(), PsiComment.class)); + comments.addAll(PsiTreeUtil.getChildrenOfTypeAsList(ifStatementList, PsiComment.class)); + comments.addAll(PsiTreeUtil.getChildrenOfTypeAsList(stList, PsiComment.class)); for (PsiElement comm : comments) { ifStatement.getIfPart().addBefore(comm, ifStatementList); comm.delete(); } - ifStatementList.replace(stList); } }