access static via instance: ensure type params are attached to the class reference (IDEA-139440)

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java

@@ -97,9 +97,11 @@ public class AccessStaticViaInstanceFix extends LocalQuickFixAndIntentionActionO
         if (!checkSideEffects(project, containingClass, qualifierExpression, factory, myExpression,editor)) return;
         PsiElement newQualifier = qualifierExpression.replace(factory.createReferenceExpression(containingClass));
         PsiElement qualifiedWithClassName = myExpression.copy();
-        newQualifier.delete();
-        if (myExpression.resolve() != myMember) {
-          myExpression.replace(qualifiedWithClassName);
+        if (myExpression.getTypeParameters().length == 0) {
+          newQualifier.delete();
+          if (myExpression.resolve() != myMember) {
+            myExpression.replace(qualifiedWithClassName);
+          }
         }
       }
     }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/accessStaticViaInstance/afterPreserveTypeArgs.java

@@ -0,0 +1,27 @@
+// "Access static 'Bug.right(B)' via class 'Bug' reference" "true"
+
+class Bug<A, B> {
+    public A getLeft() {
+        return null;
+    }
+
+    public B getRight() {
+        return null;
+    }
+
+    private boolean isRight() {
+        return false;
+    }
+
+    public static <A, B> Bug<A, B> left(A a) {
+        return null;
+    }
+
+    public static <A, B> Bug<A, B> right(B b) {
+        return null;
+    }
+
+    public Bug<A, B> foo() {
+        return isRight() ? Bug.<A, B>right(getRight()) : this.<A,B>left(getLeft());
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/accessStaticViaInstance/beforePreserveTypeArgs.java

@@ -0,0 +1,27 @@
+// "Access static 'Bug.right(B)' via class 'Bug' reference" "true"
+
+class Bug<A, B> {
+    public A getLeft() {
+        return null;
+    }
+
+    public B getRight() {
+        return null;
+    }
+
+    private boolean isRight() {
+        return false;
+    }
+
+    public static <A, B> Bug<A, B> left(A a) {
+        return null;
+    }
+
+    public static <A, B> Bug<A, B> right(B b) {
+        return null;
+    }
+
+    public Bug<A, B> foo() {
+        return isRight() ? this.<A, B><caret>right(getRight()) : this.<A,B>left(getLeft());
+    }
+}