From 62de24d6c9896072ee4f2ce6cffa040ef4ccc20d Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 17 Jan 2012 13:58:00 +0400
Subject: [PATCH] KT-1021  "internal" is suggested in completion where type is
 expected

---
 .../plugin/completion/JetKeywordCompletionContributor.java | 3 ++-
 idea/testData/completion/keywords/AfterClassProperty.kt    | 7 +++++++
 idea/testData/completion/keywords/InClassProperty.kt       | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/completion/keywords/AfterClassProperty.kt
 create mode 100644 idea/testData/completion/keywords/InClassProperty.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
index 0fbf10a8364..af001ad3809 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
@@ -118,7 +118,8 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
         @Override
         public boolean isAcceptable(Object element, PsiElement context) {
             //noinspection unchecked
-            return PsiTreeUtil.getParentOfType(context, JetClassBody.class, true, JetBlockExpression.class) != null;
+            return PsiTreeUtil.getParentOfType(context, JetClassBody.class, true,
+                                               JetBlockExpression.class, JetProperty.class) != null;
         }
 
         @Override
diff --git a/idea/testData/completion/keywords/AfterClassProperty.kt b/idea/testData/completion/keywords/AfterClassProperty.kt
new file mode 100644
index 00000000000..0b0fe0c590d
--- /dev/null
+++ b/idea/testData/completion/keywords/AfterClassProperty.kt
@@ -0,0 +1,7 @@
+class MouseMovedEventArgs
+{
+  public val X : int = 0
+  in<caret>
+}
+
+// EXIST: internal
\ No newline at end of file
diff --git a/idea/testData/completion/keywords/InClassProperty.kt b/idea/testData/completion/keywords/InClassProperty.kt
new file mode 100644
index 00000000000..8647c7d465e
--- /dev/null
+++ b/idea/testData/completion/keywords/InClassProperty.kt
@@ -0,0 +1,6 @@
+class MouseMovedEventArgs
+{
+  public val X : int<caret> = 0
+}
+
+// ABSENT: internal
\ No newline at end of file