add static import: remove qualifier in case of inheritance (IDEA-155419)

java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java

@@ -242,22 +242,11 @@ public class AddSingleMemberStaticImportAction extends BaseElementAtCaretIntenti
                   aClass = PsiUtil.resolveClassInClassTypeOnly(((PsiVariable)aClass).getType());
                 }
                 if (aClass instanceof PsiClass && InheritanceUtil.isInheritorOrSelf((PsiClass)aClass, resolvedClass, true)) {
-                  boolean foundMemberByName = false;
-                  if (referent instanceof PsiMember) {
-                    final String memberName = ((PsiMember)referent).getName();
-                    final PsiClass containingClass = PsiTreeUtil.getParentOfType(reference, PsiClass.class);
-                    if (containingClass != null) {
-                      foundMemberByName |= containingClass.findFieldByName(memberName, true) != null;
-                      foundMemberByName |= containingClass.findMethodsByName(memberName, true).length > 0;
-                    }
+                  try {
+                    qualifierExpression.delete();
                   }
-                  if (!foundMemberByName) {
-                    try {
-                      qualifierExpression.delete();
-                    }
-                    catch (IncorrectOperationException e) {
-                      LOG.error(e);
-                    }
+                  catch (IncorrectOperationException e) {
+                    LOG.error(e);
                   }
                 }
               }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/afterFieldInSuperClass.java

@@ -0,0 +1,17 @@
+// "Add static import for 'test.StaticImport.v'" "true"
+package test;
+
+import static test.StaticImport.v;
+
+class StaticImport {
+    static String v = "123";
+
+
+}
+
+class Child extends StaticImport {
+    public static void main(String[] args) {
+        System.out.println(v);
+
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/beforeFieldInSuperClass.java

@@ -0,0 +1,15 @@
+// "Add static import for 'test.StaticImport.v'" "true"
+package test;
+
+class StaticImport {
+    static String v = "123";
+
+
+}
+
+class Child extends StaticImport {
+    public static void main(String[] args) {
+        System.out.println(StaticImport.<caret>v);
+
+    }
+}