From 6c9fe553e9ab9b5d4a19bc72d46d9e1c35efd5c7 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Mon, 28 Nov 2016 15:28:10 +0100
Subject: [PATCH] completion in interfaces: avoid default/static combination

---
 .../codeInsight/completion/JavaKeywordCompletion.java     | 8 +-------
 .../intellij/codeInsight/completion/ModifierChooser.java  | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
index 75bf06fbc6b9..bf712eda9ab8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -477,12 +477,6 @@ public class JavaKeywordCompletion {
       for (String s : ModifierChooser.getKeywords(position)) {
         result.consume(new OverrideableSpace(createKeyword(position, s), TailType.HUMBLE_SPACE_BEFORE_WORD));
       }
-      if (PsiUtil.isLanguageLevel8OrHigher(position)) {
-        PsiClass containingClass = PsiTreeUtil.getParentOfType(position, PsiClass.class);
-        if (containingClass != null && containingClass.isInterface()) {
-          result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.DEFAULT), TailType.HUMBLE_SPACE_BEFORE_WORD));
-        }
-      }
 
       result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.CLASS), TailType.HUMBLE_SPACE_BEFORE_WORD));
       if (PsiTreeUtil.getParentOfType(position, PsiCodeBlock.class, true, PsiMember.class) == null) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java b/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java
index 3563758064f4..bb41372cf570 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java
@@ -51,13 +51,13 @@ public class ModifierChooser {
 
   private static final String[][] INTERFACE_9_MEMBER_MODIFIERS = {
     {PsiKeyword.PUBLIC, PsiKeyword.PROTECTED, PsiKeyword.PRIVATE},
-    {PsiKeyword.STATIC},
+    {PsiKeyword.STATIC, PsiKeyword.DEFAULT},
     {PsiKeyword.FINAL, PsiKeyword.ABSTRACT}
   };
 
   private static final String[][] INTERFACE_8_MEMBER_MODIFIERS = {
     {PsiKeyword.PUBLIC, PsiKeyword.PROTECTED},
-    {PsiKeyword.STATIC},
+    {PsiKeyword.STATIC, PsiKeyword.DEFAULT},
     {PsiKeyword.FINAL, PsiKeyword.ABSTRACT}
   };