From e7cde75a582fa0a56e981bd1e2f238fcaa50d929 Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <no_reply@jetbrains.com>
Date: Sun, 6 Feb 2005 15:10:41 +0300
Subject: [PATCH] SCR 43015

---
 .../codeInsight/completion/JavaCompletionData.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/com/intellij/codeInsight/completion/JavaCompletionData.java b/source/com/intellij/codeInsight/completion/JavaCompletionData.java
index 7952a0d7fbdd..eed1cdc1a87f 100644
--- a/source/com/intellij/codeInsight/completion/JavaCompletionData.java
+++ b/source/com/intellij/codeInsight/completion/JavaCompletionData.java
@@ -171,17 +171,22 @@ class JavaCompletionData extends CompletionData{
       this.registerVariant(variant);
     }
 
-// Completion after extends in interface and implements in class
+// Completion after extends in interface, type parameter and implements in class
 // position
     {
       final ElementFilter position = new AndFilter(
         new NotFilter(new AfterElementFilter(new TextFilter("{"))),
-        new OrFilter(
+        new OrFilter( new ElementFilter [] {
           new AndFilter(
             new LeftNeighbour(new TextFilter(PsiKeyword.EXTENDS, ",")),
             new ScopeFilter(new InterfaceFilter())
           ),
+          new AndFilter(
+            new LeftNeighbour(new TextFilter(PsiKeyword.EXTENDS, "&")),
+            new ScopeFilter(new ClassFilter(PsiTypeParameter.class))
+          ),
           new LeftNeighbour(new TextFilter(PsiKeyword.IMPLEMENTS, ","))
+        }
         )
       );
 // completion