IDEA-152033 Suggest current class for Class<?> parameter (for logging-related stuff)

java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java

@@ -1154,7 +1154,8 @@ public class ExpectedTypesProvider {
           }
         }
       }
-      if ("Logger".equals(containingClass.getName()) || "Log".equals(containingClass.getName())) {
+      String className = containingClass.getName();
+      if (className != null && className.startsWith("Log")) {
         if (parameterType instanceof PsiClassType) {
           PsiType typeArg = PsiUtil.substituteTypeParameter(parameterType, CommonClassNames.JAVA_LANG_CLASS, 0, true);
           if (typeArg != null && TypeConversionUtil.erasure(typeArg).equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) {

java/java-tests/testData/codeInsight/completion/smartTypeSorting/GetWildcardFactoryLogger.java

@@ -0,0 +1,7 @@
+public class Foo {
+  public static final Logger LOG = LoggerFactory.getLogger(<caret>)
+}
+
+class LoggerFactory {
+  static Logger getLogger(Class<?> c) {}
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.groovy

@@ -324,6 +324,9 @@ public class SmartTypeCompletionOrderingTest extends CompletionSortingTestCase {
   public void testGetWildcardLogger() {
     checkPreferredItems 0, 'Foo.class', 'forName'
   }
+  public void testGetWildcardFactoryLogger() {
+    checkPreferredItems 0, 'Foo.class', 'forName'
+  }
   public void testPreferLocalWildcardClassOverObject() {
     checkPreferredItems 0, 'type', 'Object.class'
   }