From f3389a51ad522be2c81b625c3db68449a89cb54b Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 30 Apr 2012 12:45:28 +0200 Subject: [PATCH] try to insert fqn and optimize imports after that (IDEA-85207) --- .../daemon/impl/quickfix/CreateFieldFromUsageFix.java | 2 +- .../intellij/codeInsight/intention/impl/TypeExpression.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java index c74f1c7e59e8..ddf177c70cb2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java @@ -126,7 +126,7 @@ public class CreateFieldFromUsageFix extends CreateVarFromUsageFix { final Editor newEditor = positionCursor(project, targetFile, field); TextRange range = field.getTextRange(); newEditor.getDocument().deleteString(range.getStartOffset(), range.getEndOffset()); - template.setToShortenLongNames(false); + if (expectedTypes.length > 1) template.setToShortenLongNames(false); startTemplate(newEditor, template, project, new TemplateEditingAdapter() { @Override diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java index 8f9ad7e76846..b0247a387e84 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java @@ -53,6 +53,11 @@ public class TypeExpression extends Expression { public void handleRecalc(PsiFile psiFile, Document document, int segmentStart, int segmentEnd) { if (myItems.size() <= 1) super.handleRecalc(psiFile, document, segmentStart, segmentEnd); } + + @Override + public String toString() { + return myItems.size() == 1 ? type.getCanonicalText() : super.toString(); + } }; }