exclude from completion should also affect implicitly imported items (IDEA-68605)

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

@@ -438,7 +438,7 @@ public class JavaCompletionUtil {
       if (item != null) {
         final Object o = item.getObject();
         if (o instanceof PsiClass) {
-          if (!isSourceLevelAccessible(element, (PsiClass)o, pkgContext)) {
+          if (!isSourceLevelAccessible(element, (PsiClass)o, pkgContext) || isInExcludedPackage((PsiClass)o)) {
             continue;
           }
         }

java/java-tests/testData/codeInsight/completion/normal/ExcludeStringBuffer.java

@@ -0,0 +1,3 @@
+public class Main {
+  StringBuf<caret>
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy

@@ -396,6 +396,16 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
     doTest();
   }
 
+  public void testExcludeStringBuffer() throws Throwable {
+    CodeInsightSettings.getInstance().EXCLUDED_PACKAGES = [StringBuffer.name] as String[]
+    try {
+      doAntiTest()
+    }
+    finally {
+      CodeInsightSettings.getInstance().EXCLUDED_PACKAGES = new String[0]
+    }
+  }
+
   public void testAtUnderClass() throws Throwable {
     doTest();
   }

plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java

@@ -417,6 +417,10 @@ public class GroovyCompletionContributor extends CompletionContributor {
           object = ((GroovyResolveResult)object).getElement();
         }
 
+        if (object instanceof PsiClass && JavaCompletionUtil.isInExcludedPackage((PsiClass)object)) {
+          return;
+        }
+
         final boolean autopopup = parameters.getInvocationCount() == 0;
         //skip default groovy methods
         if (firstCompletionInvoked &&

plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy

@@ -777,6 +777,17 @@ class Fopppp {
 ''')
   }
 
+  public void testExcludeStringBuffer() {
+    assert doContainsTest('StringBuffer', 'StringBuff<caret>f')
+    CodeInsightSettings.getInstance().EXCLUDED_PACKAGES = [StringBuffer.name] as String[]
+    try {
+      assert !doContainsTest('StringBuffer', 'StringBuff<caret>f')
+    }
+    finally {
+      CodeInsightSettings.getInstance().EXCLUDED_PACKAGES = new String[0]
+    }
+  }
+
   private doContainsTest(String itemToCheck, String text) {
     myFixture.configureByText "a.groovy", text