From c6caffe02d4cb97aade7101f3898ed6c6fa13f29 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 29 Dec 2011 20:37:47 +0400
Subject: [PATCH] Keywords autocompletion - nothing for top scope after package
 directive

---
 .../completion/JetKeywordCompletionContributor.java      | 3 ++-
 .../completion/keywords/InTopScopeAfterPackage.kt        | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/completion/keywords/InTopScopeAfterPackage.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
index 7866c92206b..0fbf10a8364 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
@@ -79,7 +79,8 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
         @Override
         public boolean isAcceptable(Object element, PsiElement context) {
             //noinspection unchecked
-            return PsiTreeUtil.getParentOfType(context, JetFile.class, false, JetClass.class, JetFunction.class) != null;
+            return PsiTreeUtil.getParentOfType(context, JetFile.class, false, JetClassBody.class, JetBlockExpression.class) != null &&
+                   PsiTreeUtil.getParentOfType(context, JetParameterList.class, JetTypeParameterList.class) == null;
         }
 
         @Override
diff --git a/idea/testData/completion/keywords/InTopScopeAfterPackage.kt b/idea/testData/completion/keywords/InTopScopeAfterPackage.kt
new file mode 100644
index 00000000000..80d8446a904
--- /dev/null
+++ b/idea/testData/completion/keywords/InTopScopeAfterPackage.kt
@@ -0,0 +1,9 @@
+package Test
+
+<caret>
+
+// EXIST:  enum
+// EXIST:  trait
+// EXIST:  class
+// EXIST:  fun
+