try to insert fqn and optimize imports after that (IDEA-85207)

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

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();
+      }
     };
   }