Fixed completion for type parameters broken recently

core/descriptors/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt

@@ -16,15 +16,15 @@
 
 package org.jetbrains.kotlin.renderer
 
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.name.FqNameBase
 import org.jetbrains.kotlin.name.Name
 
 public fun qualifiedNameForSourceCode(descriptor: ClassifierDescriptor): String {
     val nameString = descriptor.getName().render()
+    if (descriptor is TypeParameterDescriptor) {
+        return nameString
+    }
     val qualifier = qualifierName(descriptor.getContainingDeclaration())
     return if (qualifier != null && qualifier != "") qualifier + "." + nameString else nameString
 }

idea/idea-completion/testData/handlers/basic/TypeParameter.kt

@@ -0,0 +1,7 @@
+package xxx
+
+class A<T> {
+    fun foo(x: <caret>)
+}
+
+// ELEMENT: T

idea/idea-completion/testData/handlers/basic/TypeParameter.kt.after

@@ -0,0 +1,7 @@
+package xxx
+
+class A<T> {
+    fun foo(x: T<caret>)
+}
+
+// ELEMENT: T

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java

@@ -143,6 +143,12 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion
         doTest(fileName);
     }
 
+    @TestMetadata("TypeParameter.kt")
+    public void testTypeParameter() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/TypeParameter.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("idea/idea-completion/testData/handlers/basic/exclChar")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)