inplace introduce: do not erase users input if any (IDEA-61172)

This commit is contained in:
anna
2010-11-12 21:37:17 +03:00
parent 4007617fe3
commit 0e9cdba88a
@@ -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);
}