From 9b2f7ce7e23c5539abaae5b84df079726bd2ce6e Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 30 Mar 2011 15:22:49 +0200 Subject: [PATCH] inplace introduce: restore expression if text equals --- .../introduceParameter/AbstractInplaceIntroducer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractInplaceIntroducer.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractInplaceIntroducer.java index 39ad7194929a..6506cca2fb90 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractInplaceIntroducer.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractInplaceIntroducer.java @@ -138,7 +138,7 @@ public abstract class AbstractInplaceIntroducer extends VariableInplaceIntroduce Comparing.strEqual(psiVariable.getName(), ((PsiReferenceExpression)expression).getReferenceName()))) { return (PsiExpression)expression.replace(elementFactory.createExpressionFromText(exprText, psiVariable)); } - return null; + return expression != null && expression.isValid() && expression.getText().equals(exprText) ? expression : null; } protected abstract class VisibilityListener implements ChangeListener {