IDEA-144532 "extends" keyword is not hinted correctly

java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java

@@ -469,6 +469,9 @@ public class JavaKeywordCompletion {
       if (referenceList != null && referenceList.getParent() instanceof PsiClass) {
         psiClass = (PsiClass)referenceList.getParent();
       }
+      else if (prevLeaf.getParent() instanceof PsiTypeParameterList && prevLeaf.getParent().getParent() instanceof PsiClass) {
+        psiClass = (PsiClass)prevLeaf.getParent().getParent();
+      }
     }
 
     if (psiClass != null) {

java/java-tests/testData/codeInsight/completion/keywords/extendsAfterClassGenerics.java

@@ -0,0 +1,2 @@
+class A<T> <caret> {
+}

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

@@ -64,6 +64,7 @@ public class KeywordCompletionTest extends LightCompletionTestCase {
   public void testExtends11() throws Exception { doTest(false); }
   public void testExtends12() throws Exception { doTest(false); }
   public void testExtends13() throws Exception { doTest(false); }
+  public void testExtendsAfterClassGenerics() throws Exception { doTest(2, "extends", "implements"); }
   public void testSynchronized1() throws Exception { doTest(false); }
 
   public void testSynchronized2() throws Exception {