IDEA-91588 Reflection completion generates generics types

java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangClassMemberReference.java

@@ -23,6 +23,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
+import com.intellij.psi.impl.source.PsiClassReferenceType;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.*;
 import org.jetbrains.annotations.NotNull;
@@ -162,7 +163,7 @@ public class JavaLangClassMemberReference extends PsiReferenceBase<PsiLiteralExp
   private static String getMethodTypes(PsiMethod method) {
     final StringBuilder buf = new StringBuilder();
     for (PsiParameter parameter : method.getParameterList().getParameters()) {
-      buf.append(", ").append(parameter.getType().getCanonicalText()).append(".class");
+      buf.append(", ").append(((PsiClassReferenceType)parameter.getType()).getReference().getReferenceName()).append(".class");
     }
     return buf.toString();
   }

java/java-tests/testData/codeInsight/completion/reflection/Generics.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Generics {
+  void foo() {
+    Test.class.getMethod("<caret>");
+  }
+}
+
+class Test {
+  public void foo(A<? extends Test> name) {}
+}
+class A<K> {}

java/java-tests/testData/codeInsight/completion/reflection/Generics_after.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Generics {
+  void foo() {
+    Test.class.getMethod("foo", A.class);
+  }
+}
+
+class Test {
+  public void foo(A<? extends Test> name) {}
+}
+class A<K> {}

java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaReflectionCompletionTest.java

@@ -63,6 +63,10 @@ public class JavaReflectionCompletionTest extends LightFixtureCompletionTestCase
     doTest(2, "num", "num2", "num3");
   }
 
+  public void testGenerics() throws Exception {
+    doTest(0, "foo");
+  }
+
   private void doTest(int index, String... expected) {
     configureByFile(getTestName(false) + ".java");
     assertStringItems(expected);