cleanup shortening references

java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java

@@ -84,15 +84,22 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
     throws IncorrectOperationException {
     CheckUtil.checkWritable(element);
     if (SourceTreeToPsiMap.hasTreeElement(element)) {
-      final ReferenceAdjuster adjuster = ReferenceAdjusterFactory.Extension.getFactory(element.getLanguage()).createReferenceAdjuster(myProject);
-      adjuster.processRange(element.getNode(), startOffset, endOffset);
+      final ReferenceAdjusterFactory factory = ReferenceAdjusterFactory.Extension.getFactory(element.getLanguage());
+      if (factory != null) {
+        final ReferenceAdjuster adjuster = factory.createReferenceAdjuster(myProject);
+        adjuster.processRange(element.getNode(), startOffset, endOffset);
+      }
     }
   }
 
   @Override
   public PsiElement qualifyClassReferences(@NotNull PsiElement element) {
-    final ASTNode reference = new JavaReferenceAdjuster(true, true).process(element.getNode(), false, false);
-    return SourceTreeToPsiMap.treeToPsiNotNull(reference);
+    final ReferenceAdjusterFactory factory = ReferenceAdjusterFactory.Extension.getFactory(element.getLanguage());
+    if (factory != null) {
+      final ASTNode reference = factory.createReferenceAdjuster(true, true).process(element.getNode(), false, false);
+      return SourceTreeToPsiMap.treeToPsiNotNull(reference);
+    }
+    return element;
   }
 
   @Override

java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjusterFactory.java

@@ -19,17 +19,20 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.ReferenceAdjuster;
 import com.intellij.psi.codeStyle.ReferenceAdjusterFactory;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Max Medvedev
  */
 public class JavaReferenceAdjusterFactory implements ReferenceAdjusterFactory {
 
+  @NotNull
   @Override
   public ReferenceAdjuster createReferenceAdjuster(boolean useFqInJavadoc, boolean useFqInCode) {
     return new JavaReferenceAdjuster(useFqInJavadoc, useFqInCode);
   }
 
+  @NotNull
   @Override
   public ReferenceAdjuster createReferenceAdjuster(Project project) {
     return new JavaReferenceAdjuster(CodeStyleSettingsManager.getSettings(project));

java/java-psi-api/src/com/intellij/psi/codeStyle/ReferenceAdjusterFactory.java

@@ -18,14 +18,17 @@ package com.intellij.psi.codeStyle;
 import com.intellij.lang.Language;
 import com.intellij.lang.LanguageExtension;
 import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Max Medvedev
  */
 public interface ReferenceAdjusterFactory {
 
+  @NotNull
   ReferenceAdjuster createReferenceAdjuster(boolean useFqInJavadoc, boolean useFqInCode);
 
+  @NotNull
   ReferenceAdjuster createReferenceAdjuster(Project project);
 
   class Extension extends LanguageExtension<ReferenceAdjusterFactory> {

plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrReferenceAdjusterFactory.java

@@ -19,16 +19,19 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.ReferenceAdjuster;
 import com.intellij.psi.codeStyle.ReferenceAdjusterFactory;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Max Medvedev
  */
 public class GrReferenceAdjusterFactory implements ReferenceAdjusterFactory {
+  @NotNull
   @Override
   public ReferenceAdjuster createReferenceAdjuster(boolean useFqInJavadoc, boolean useFqInCode) {
     return new GrReferenceAdjuster(useFqInJavadoc, useFqInCode);
   }
 
+  @NotNull
   @Override
   public ReferenceAdjuster createReferenceAdjuster(Project project) {
     return new GrReferenceAdjuster(CodeStyleSettingsManager.getSettings(project).getCustomSettings(GroovyCodeStyleSettings.class));

plugins/javaFX/testData/quickfix/CreateControllerMethodInGroovy_after.groovy

@@ -1,3 +1,5 @@
+import javafx.event.ActionEvent
+
 public class CreateControllerMethodInGroovy {
     public void bar(ActionEvent actionEvent) {