avoid creating intersections from unresolved classes

GitOrigin-RevId: 3df59f4427f120185f8da6744500530402fbbfc0

plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/inference/InferenceProcessUtil.kt

@@ -98,7 +98,8 @@ fun PsiType.forceWildcardsAsTypeArguments(): PsiType {
       val resolvedClass = classType.resolve()
       if (resolvedClass != null) {
         return factory.createType(resolvedClass, *mappedParameters.toTypedArray())
-      } else {
+      }
+      else {
         return PsiWildcardType.createUnbounded(manager)
       }
     }
@@ -243,7 +244,7 @@ fun PsiSubstitutor.removeForeignTypeParameters(method: GrMethod): PsiSubstitutor
     }
 
     override fun visitIntersectionType(intersectionType: PsiIntersectionType?): PsiType? {
-      return compress(intersectionType?.conjuncts?.filterNotNull()?.map { it.accept(this) })
+      return compress(intersectionType?.conjuncts?.filterNotNull()?.mapNotNull { it.accept(this) })
     }
 
     override fun visitWildcardType(wildcardType: PsiWildcardType?): PsiType? {

plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/InferMethodParametersTypesIntentionTest.groovy

@@ -517,4 +517,7 @@ class AA { static void fo<caret>o(Integer a) {} }
     doTest(true)
   }
 
+  void testUnresolvedCode2() {
+    doTest(true)
+  }
 }

plugins/groovy/testdata/refactoring/inferMethodParametersTypes/UnresolvedCode2.groovy

@@ -0,0 +1,7 @@
+def foo(a) {
+
+}
+
+def <T extends Serializable & Unresolved> void m() {
+  foo(null as T)
+}

plugins/groovy/testdata/refactoring/inferMethodParametersTypes/UnresolvedCode2_after.groovy

@@ -0,0 +1,7 @@
+void foo(Object a) {
+
+}
+
+def <T extends Serializable & Unresolved> void m() {
+  foo(null as T)
+}