From 0e9cdba88af78e5aee78e477311a2dbc29e7b24f Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 12 Nov 2010 21:01:51 +0300 Subject: [PATCH] inplace introduce: do not erase users input if any (IDEA-61172) --- .../refactoring/rename/inplace/VariableInplaceRenamer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java index 234f3e81b646..12de46e1bfd5 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java @@ -22,6 +22,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.codeInsight.lookup.impl.LookupImpl; import com.intellij.codeInsight.template.*; +import com.intellij.codeInsight.template.impl.TemplateManagerImpl; import com.intellij.codeInsight.template.impl.TemplateState; import com.intellij.injected.editor.VirtualFileWindow; import com.intellij.lang.LanguageExtension; @@ -460,10 +461,14 @@ public class VariableInplaceRenamer { } public Result calculateQuickResult(ExpressionContext context) { - return new TextResult(myName); + return calculateResult(context); } public Result calculateResult(ExpressionContext context) { + final TextResult insertedValue = TemplateManagerImpl.getTemplateState(myEditor).getVariableValue(PRIMARY_VARIABLE_NAME); + if (insertedValue != null) { + if (!insertedValue.getText().isEmpty()) return insertedValue; + } return new TextResult(myName); }