IDEA-115884 Auto-complete qualified super reference in virtual extension methods.

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

@@ -429,8 +429,13 @@ public class JavaCompletionData extends JavaAwareCompletionData {
     }
 
     if (SUPER_OR_THIS_PATTERN.accepts(position)) {
-      if (!AFTER_DOT.accepts(position) || isInsideQualifierClass(position)) {
-        result.addElement(createKeyword(position, PsiKeyword.THIS));
+      final boolean afterDot = AFTER_DOT.accepts(position);
+      final boolean insideQualifierClass = isInsideQualifierClass(position);
+      final boolean insideInheritorClass = PsiUtil.isLanguageLevel8OrHigher(position) && isInsideInheritorClass(position);
+      if (!afterDot || insideQualifierClass || insideInheritorClass) {
+        if (!afterDot || insideQualifierClass) {
+          result.addElement(createKeyword(position, PsiKeyword.THIS));
+        }
 
         final LookupItem superItem = (LookupItem)createKeyword(position, PsiKeyword.SUPER);
         if (psiElement().afterLeaf(psiElement().withText("{").withSuperParent(2, psiMethod().constructor(true))).accepts(position)) {
@@ -732,6 +737,25 @@ public class JavaCompletionData extends JavaAwareCompletionData {
     return false;
   }
 
+  private static boolean isInsideInheritorClass(PsiElement position) {
+    if (position.getParent() instanceof PsiJavaCodeReferenceElement) {
+      final PsiElement qualifier = ((PsiJavaCodeReferenceElement)position.getParent()).getQualifier();
+      if (qualifier instanceof PsiJavaCodeReferenceElement) {
+        final PsiElement qualifierClass = ((PsiJavaCodeReferenceElement)qualifier).resolve();
+        if (qualifierClass instanceof PsiClass && ((PsiClass)qualifierClass).isInterface()) {
+          PsiElement parent = position;
+          while ((parent = PsiTreeUtil.getParentOfType(parent, PsiClass.class, true)) != null) {
+            if (PsiUtil.getEnclosingStaticElement(position, (PsiClass)parent) == null && 
+                ((PsiClass)parent).isInheritor((PsiClass)qualifierClass, true)) {
+              return true;
+            }
+          }
+        }
+      }
+    }
+    return false;
+  }
+
   private static boolean superConstructorHasParameters(PsiMethod method) {
     final PsiClass psiClass = method.getContainingClass();
     if (psiClass == null) {

java/java-tests/testData/codeInsight/completion/keywords/super3.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.
+ */
+interface Super
+{
+    default void method() {}
+}
+
+interface Sub extends Super {
+    default void foo() {
+          Super.<caret>
+    }
+}

java/java-tests/testData/codeInsight/completion/keywords/super3_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.
+ */
+interface Super
+{
+    default void method() {}
+}
+
+interface Sub extends Super {
+    default void foo() {
+          Super.super
+    }
+}

java/java-tests/testData/codeInsight/completion/keywords/super4.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.
+ */
+interface Super
+{
+    default void method() {}
+}
+
+interface Sub extends Super {
+    static void foo() {
+          Super.<caret>
+    }
+}

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

@@ -90,6 +90,8 @@ public class KeywordCompletionTest extends LightCompletionTestCase {
   public void testCatchFinally() throws Exception { doTest(2, "catch", "finally"); }
   public void testSuper1() throws Exception { doTest(1, "super"); }
   public void testSuper2() throws Exception { doTest(0, "super"); }
+  public void testSuper3() throws Exception { doTest(true); }
+  public void testSuper4() throws Exception { doTest(0, "class"); }
   public void testContinue() throws Exception { doTest(false); }
   public void testThrowsOnSeparateLine() throws Exception { doTest(false); }
   public void testDefaultInAnno() throws Exception { doTest(false); }