IDEA-180288 Quick fix breaks code: Optional.ofNullable() with not-null argument

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFromOfNullable/afterNotNullLiteralStaticImport.java

@@ -0,0 +1,10 @@
+// "Replace with '.of()'" "true"
+import java.util.Optional;
+
+import static java.util.Optional.ofNullable;
+
+class A{
+  void test(){
+    Optional.of(11);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFromOfNullable/afterNotNullLiteralStaticImportAsterisk.java

@@ -0,0 +1,8 @@
+// "Replace with '.of()'" "true"
+import static java.util.Optional.*;
+
+class A{
+  void test(){
+    of(11);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFromOfNullable/afterNotNullLiteralStaticImportAsteriskNameConflict.java

@@ -0,0 +1,12 @@
+// "Replace with '.of()'" "true"
+import java.util.Optional;
+
+import static java.util.Optional.*;
+
+class A{
+  void of() {}
+
+  void test(){
+    Optional.of(11);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFromOfNullable/beforeNotNullLiteralStaticImport.java

@@ -0,0 +1,8 @@
+// "Replace with '.of()'" "true"
+import static java.util.Optional.ofNullable;
+
+class A{
+  void test(){
+    ofNullable(1<caret>1);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFromOfNullable/beforeNotNullLiteralStaticImportAsterisk.java

@@ -0,0 +1,8 @@
+// "Replace with '.of()'" "true"
+import static java.util.Optional.*;
+
+class A{
+  void test(){
+    ofNullable(1<caret>1);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceFromOfNullable/beforeNotNullLiteralStaticImportAsteriskNameConflict.java

@@ -0,0 +1,10 @@
+// "Replace with '.of()'" "true"
+import static java.util.Optional.*;
+
+class A{
+  void of() {}
+
+  void test(){
+    ofNullable(1<caret>1);
+  }
+}

plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java

@@ -979,7 +979,9 @@ public class ExpressionUtils {
   }
 
   /**
-   * Bind a reference element to a new name. The qualifier and type arguments (if present) remain the same
+   * Bind a reference element to a new name. The type arguments (if present) remain the same.
+   * The qualifier remains the same unless the original unqualified reference resolves
+   * to statically imported member. In this case the qualifier could be added.
    *
    * @param ref reference element to rename
    * @param newName new name
@@ -990,12 +992,28 @@ public class ExpressionUtils {
       throw new IllegalStateException("Name element is null: "+ref);
     }
     if(newName.equals(nameElement.getText())) return;
-    PsiIdentifier identifier = JavaPsiFacade.getElementFactory(ref.getProject()).createIdentifier(newName);
+    PsiClass aClass = null;
+    if(ref.getQualifierExpression() == null) {
+      PsiMember member = ObjectUtils.tryCast(ref.resolve(), PsiMember.class);
+      if (member != null && ImportUtils.isStaticallyImported(member, ref)) {
+        aClass = member.getContainingClass();
+      }
+    }
+    PsiElementFactory factory = JavaPsiFacade.getElementFactory(ref.getProject());
+    PsiIdentifier identifier = factory.createIdentifier(newName);
     nameElement.replace(identifier);
+    if(aClass != null) {
+      PsiMember member = ObjectUtils.tryCast(ref.resolve(), PsiMember.class);
+      if (member == null || member.getContainingClass() != aClass) {
+        ref.setQualifierExpression(factory.createReferenceExpression(aClass));
+      }
+    }
   }
 
   /**
-   * Bind method call to a new name. Everything else like qualifier, type arguments or call arguments remain the same.
+   * Bind method call to a new name. Type arguments and call arguments remain the same.
+   * The qualifier remains the same unless the original unqualified reference resolves
+   * to statically imported member. In this case the qualifier could be added.
    *
    * @param call to rename
    * @param newName new name