diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot1.java b/java/java-tests/testData/codeInsight/completion/dot/Dot1.java
new file mode 100644
index 000000000000..0eefb685d2d2
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot1.java
@@ -0,0 +1,11 @@
+class Dot1{
+  class A{
+    int a = 0;
+    int foo(){
+  }
+  }
+  static {
+	
+    int a = new A().<caret>
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot10.java b/java/java-tests/testData/codeInsight/completion/dot/Dot10.java
new file mode 100644
index 000000000000..d0957412660a
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot10.java
@@ -0,0 +1,18 @@
+/**
+ * Created by IntelliJ IDEA.
+ * User: ik
+ * Date: 23.01.2003
+ * Time: 17:06:57
+ * To change this template use Options | File Templates.
+ */
+public class Dot9 {
+    public static class A{
+        public A(){}
+        public void foo(){}
+    }
+
+    public static void main(String[] args) {
+        long[] arr = new long[0];
+        arr.<caret>
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot11.java b/java/java-tests/testData/codeInsight/completion/dot/Dot11.java
new file mode 100644
index 000000000000..872259215ae6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot11.java
@@ -0,0 +1,18 @@
+/**
+ * Created by IntelliJ IDEA.
+ * User: ik
+ * Date: 27.01.2003
+ * Time: 19:35:37
+ * To change this template use Options | File Templates.
+ */
+public class Dot11 extends A {
+    void foo1(){}
+
+    {
+        this.<caret>
+    }
+}
+
+class A{
+    void foo(){}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot12.java b/java/java-tests/testData/codeInsight/completion/dot/Dot12.java
new file mode 100644
index 000000000000..a834a3347b6b
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot12.java
@@ -0,0 +1,20 @@
+/**
+ * Created by IntelliJ IDEA.
+ * User: ik
+ * Date: 27.01.2003
+ * Time: 19:37:12
+ * To change this template use Options | File Templates.
+ */
+
+public class Dot12 extends A {
+    void foo1(){}
+
+    {
+
+        super.<caret>
+    }
+}
+
+class A{
+    void foo(){}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot2.java b/java/java-tests/testData/codeInsight/completion/dot/Dot2.java
new file mode 100644
index 000000000000..52ea39eaf9c6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot2.java
@@ -0,0 +1,11 @@
+class Dot2{
+  class A{
+    static int a = 0;
+    static int foo(){
+  }
+  }
+  static {
+	
+    int a = A.<caret>
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot3.java b/java/java-tests/testData/codeInsight/completion/dot/Dot3.java
new file mode 100644
index 000000000000..08b67b6c297d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot3.java
@@ -0,0 +1,15 @@
+class Dot3{
+  class A{
+    int a = 0;
+    int foo(){
+  }
+  }
+  static {
+    
+    Object a = new A(){
+      static int foo(){
+        int c = super.<caret>
+      }
+    };
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot4.java b/java/java-tests/testData/codeInsight/completion/dot/Dot4.java
new file mode 100644
index 000000000000..860ab1b67ede
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot4.java
@@ -0,0 +1,10 @@
+class Dot4{
+  class A{
+    static int a = 0;
+    int foo(){
+    }
+  }
+  static {
+    int a = new A().<caret>
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot5.java b/java/java-tests/testData/codeInsight/completion/dot/Dot5.java
new file mode 100644
index 000000000000..800b55c9144c
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot5.java
@@ -0,0 +1,12 @@
+import java.<caret>
+
+class Dot5{
+  class A{
+    static int a = 0;
+    int foo(){
+    }
+  }
+  static {
+    int a = new A().
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot6.java b/java/java-tests/testData/codeInsight/completion/dot/Dot6.java
new file mode 100644
index 000000000000..8de1430d813a
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot6.java
@@ -0,0 +1,5 @@
+class Dot6{
+  public static void main(String[] args){
+    int a = args[0].<caret>
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot7.java b/java/java-tests/testData/codeInsight/completion/dot/Dot7.java
new file mode 100644
index 000000000000..819f4247c7e5
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot7.java
@@ -0,0 +1,5 @@
+class Dot7{
+  public static void main(String[] args){
+    int a = args.<caret>
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot8.java b/java/java-tests/testData/codeInsight/completion/dot/Dot8.java
new file mode 100644
index 000000000000..85ef2eefec70
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot8.java
@@ -0,0 +1,19 @@
+/**
+ * Created by IntelliJ IDEA.
+ * User: ik
+ * Date: 23.01.2003
+ * Time: 15:04:45
+ * To change this template use Options | File Templates.
+ */
+public class Dot8 {
+
+    {
+        new A().<caret>
+    }
+}
+class A{
+    public String toString(){
+
+        return "".;
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/dot/Dot9.java b/java/java-tests/testData/codeInsight/completion/dot/Dot9.java
new file mode 100644
index 000000000000..1cdf11d73a51
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/dot/Dot9.java
@@ -0,0 +1,17 @@
+/**
+ * Created by IntelliJ IDEA.
+ * User: ik
+ * Date: 23.01.2003
+ * Time: 17:06:57
+ * To change this template use Options | File Templates.
+ */
+public class Dot9 {
+    public static class A{
+        public A(){}
+        public void foo(){}
+    }
+
+    public static void main(String[] args) {
+        new A().<caret>
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInCastTypeParameters-out.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInCastTypeParameters-out.java
new file mode 100644
index 000000000000..789404f0e818
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInCastTypeParameters-out.java
@@ -0,0 +1,7 @@
+
+public class Main {
+
+    public static void main() {
+        x = (ProceedingJoinPoint<? extends <caret>>
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInCastTypeParameters.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInCastTypeParameters.java
new file mode 100644
index 000000000000..8f5880237eb2
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInCastTypeParameters.java
@@ -0,0 +1,7 @@
+
+public class Main {
+
+    public static void main() {
+        x = (ProceedingJoinPoint<? ext<caret>>
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInMethodParameters-out.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInMethodParameters-out.java
new file mode 100644
index 000000000000..0fae50dd0fcc
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInMethodParameters-out.java
@@ -0,0 +1,5 @@
+public class Xxx {
+
+    <T extends <caret>
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInMethodParameters.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInMethodParameters.java
new file mode 100644
index 000000000000..3feb13009ce7
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsInMethodParameters.java
@@ -0,0 +1,5 @@
+public class Xxx {
+
+    <T ext<caret>
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtendsWithRightContextInClassTypeParameters-out.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsWithRightContextInClassTypeParameters-out.java
new file mode 100644
index 000000000000..1968e300c9d1
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsWithRightContextInClassTypeParameters-out.java
@@ -0,0 +1,3 @@
+class Foo<T extends <caret>A> {
+
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtendsWithRightContextInClassTypeParameters.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsWithRightContextInClassTypeParameters.java
new file mode 100644
index 000000000000..c90ad3278973
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtendsWithRightContextInClassTypeParameters.java
@@ -0,0 +1,3 @@
+class Foo<T ext<caret> A> {
+
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally-out.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally-out.java
new file mode 100644
index 000000000000..674fc428c5d9
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally-out.java
@@ -0,0 +1,12 @@
+
+public class Main {
+
+    public static void main() {
+        try {
+            
+        } finally {<caret>
+
+        }
+
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally.java
new file mode 100644
index 000000000000..81df57df6185
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally.java
@@ -0,0 +1,12 @@
+
+public class Main {
+
+    public static void main() {
+        try {
+            
+        } final<caret> {
+
+        }
+
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally1-out.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally1-out.java
new file mode 100644
index 000000000000..edb1b9a8e4f9
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally1-out.java
@@ -0,0 +1,12 @@
+
+public class Main {
+
+    public static void main() {
+        try {
+            
+        } finally {
+            <caret>
+        }
+
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally1.java b/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally1.java
new file mode 100644
index 000000000000..1cd4a6d72590
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/ExtraBracketAfterFinally1.java
@@ -0,0 +1,10 @@
+
+public class Main {
+
+    public static void main() {
+        try {
+            
+        } final<caret>
+
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/NullInIf-out.java b/java/java-tests/testData/codeInsight/completion/keywords/NullInIf-out.java
new file mode 100644
index 000000000000..9fd613410a95
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/NullInIf-out.java
@@ -0,0 +1,8 @@
+
+public class Main {
+
+    public static void main() {
+        if (null<caret>)
+
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/NullInIf.java b/java/java-tests/testData/codeInsight/completion/keywords/NullInIf.java
new file mode 100644
index 000000000000..421cf16e078d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/NullInIf.java
@@ -0,0 +1,8 @@
+
+public class Main {
+
+    public static void main() {
+        if (nu<caret>)
+
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall.java b/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall.java
new file mode 100644
index 000000000000..be803489e216
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall.java
@@ -0,0 +1,7 @@
+class Null {
+  public static void main(String[] argv) {
+    StringBuffer buf = new StringBuffer();
+    
+    buf.append(nu<caret>);
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall2.java b/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall2.java
new file mode 100644
index 000000000000..2233039cc872
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall2.java
@@ -0,0 +1,7 @@
+class Null {
+  public static void main(String[] argv) {
+    StringBuffer buf = new StringBuffer();
+    
+    buf.append(Null.nu<caret>);
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall2_After.java b/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall2_After.java
new file mode 100644
index 000000000000..2233039cc872
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall2_After.java
@@ -0,0 +1,7 @@
+class Null {
+  public static void main(String[] argv) {
+    StringBuffer buf = new StringBuffer();
+    
+    buf.append(Null.nu<caret>);
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall_After.java b/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall_After.java
new file mode 100644
index 000000000000..46fa66446e35
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/NullInMethodCall_After.java
@@ -0,0 +1,7 @@
+class Null {
+  public static void main(String[] argv) {
+    StringBuffer buf = new StringBuffer();
+    
+    buf.append(null);
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/TrueInVariableDeclaration-out.java b/java/java-tests/testData/codeInsight/completion/keywords/TrueInVariableDeclaration-out.java
new file mode 100644
index 000000000000..c2f393fad7f6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/TrueInVariableDeclaration-out.java
@@ -0,0 +1,8 @@
+
+public class Main {
+
+    public static void main() {
+        boolean b = true<caret>
+
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/TrueInVariableDeclaration.java b/java/java-tests/testData/codeInsight/completion/keywords/TrueInVariableDeclaration.java
new file mode 100644
index 000000000000..13ee5ed52f3b
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/TrueInVariableDeclaration.java
@@ -0,0 +1,8 @@
+
+public class Main {
+
+    public static void main() {
+        boolean b = tr<caret>
+
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/afterAnnotations.java b/java/java-tests/testData/codeInsight/completion/keywords/afterAnnotations.java
new file mode 100644
index 000000000000..1e7c47714e1a
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/afterAnnotations.java
@@ -0,0 +1,2 @@
+@Deprecated
+<caret>
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/catch-1.java b/java/java-tests/testData/codeInsight/completion/keywords/catch-1.java
new file mode 100644
index 000000000000..ba5ce5703432
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/catch-1.java
@@ -0,0 +1,8 @@
+public class A{
+ public void method(){
+  try{
+   String str = "";
+  }
+  <caret>
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/classScope-1.java b/java/java-tests/testData/codeInsight/completion/keywords/classScope-1.java
new file mode 100644
index 000000000000..ed5717c06b9f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/classScope-1.java
@@ -0,0 +1 @@
+public <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/classScope-2.java b/java/java-tests/testData/codeInsight/completion/keywords/classScope-2.java
new file mode 100644
index 000000000000..44060e3f2afd
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/classScope-2.java
@@ -0,0 +1 @@
+abstract <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/classScope-3.java b/java/java-tests/testData/codeInsight/completion/keywords/classScope-3.java
new file mode 100644
index 000000000000..09ead4497bbb
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/classScope-3.java
@@ -0,0 +1 @@
+class <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/classScope-4.java b/java/java-tests/testData/codeInsight/completion/keywords/classScope-4.java
new file mode 100644
index 000000000000..0f6c3fdac00e
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/classScope-4.java
@@ -0,0 +1,3 @@
+class A{
+<caret>
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/continue.java b/java/java-tests/testData/codeInsight/completion/keywords/continue.java
new file mode 100644
index 000000000000..9d33f53769df
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/continue.java
@@ -0,0 +1,6 @@
+
+public class Foo {
+    {
+        for(int i;;) { cont<caret> }
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/continue_after.java b/java/java-tests/testData/codeInsight/completion/keywords/continue_after.java
new file mode 100644
index 000000000000..cf2b10a423e2
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/continue_after.java
@@ -0,0 +1,6 @@
+
+public class Foo {
+    {
+        for(int i;;) { continue; }
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/defaultInAnno.java b/java/java-tests/testData/codeInsight/completion/keywords/defaultInAnno.java
new file mode 100644
index 000000000000..c07be64c037f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/defaultInAnno.java
@@ -0,0 +1,3 @@
+@interface Foo {
+  String foo() def<caret>
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/defaultInAnno_after.java b/java/java-tests/testData/codeInsight/completion/keywords/defaultInAnno_after.java
new file mode 100644
index 000000000000..f15ebae1c447
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/defaultInAnno_after.java
@@ -0,0 +1,3 @@
+@interface Foo {
+  String foo() default <caret>
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-1.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-1.java
new file mode 100644
index 000000000000..a928948d81c7
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-1.java
@@ -0,0 +1 @@
+class x3 <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-10-result.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-10-result.java
new file mode 100644
index 000000000000..9a954ae8b337
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-10-result.java
@@ -0,0 +1,3 @@
+class A{
+ void <T extends <caret>>foo(){}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-10.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-10.java
new file mode 100644
index 000000000000..68da0e944b46
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-10.java
@@ -0,0 +1,3 @@
+class A{
+ void <T e<caret>>foo(){}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-11-result.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-11-result.java
new file mode 100644
index 000000000000..87e818a076c7
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-11-result.java
@@ -0,0 +1,3 @@
+class A{
+ void <T extends String, V extends <caret>>foo(){}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-11.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-11.java
new file mode 100644
index 000000000000..a8e5fc0e9df5
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-11.java
@@ -0,0 +1,3 @@
+class A{
+ void <T extends String, V e<caret>>foo(){}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-12-result.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-12-result.java
new file mode 100644
index 000000000000..7127a5250e35
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-12-result.java
@@ -0,0 +1,5 @@
+class A{
+ {
+   Collection<? extends <caret>>
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-12.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-12.java
new file mode 100644
index 000000000000..2cc23359731c
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-12.java
@@ -0,0 +1,5 @@
+class A{
+ {
+   Collection<? ex<caret>>
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-2.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-2.java
new file mode 100644
index 000000000000..41399187fe37
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-2.java
@@ -0,0 +1,3 @@
+class AAA{}
+
+class BBB extends <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-3.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-3.java
new file mode 100644
index 000000000000..ce7fb1225cdc
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-3.java
@@ -0,0 +1,5 @@
+class AAA{}
+
+interface CCC{}
+
+class BBB extends <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-4.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-4.java
new file mode 100644
index 000000000000..ac0b51bfe351
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-4.java
@@ -0,0 +1,5 @@
+class AAA{}
+
+interface CCC{}
+
+class BBB implements <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-5.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-5.java
new file mode 100644
index 000000000000..ca5ec8e7c471
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-5.java
@@ -0,0 +1,3 @@
+class AAA{}
+
+interface BBB extends <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-6.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-6.java
new file mode 100644
index 000000000000..4308b6710ec4
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-6.java
@@ -0,0 +1,3 @@
+interface AAA{}
+
+interface BBB extends Runnable, <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-7-result.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-7-result.java
new file mode 100644
index 000000000000..e768367d0430
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-7-result.java
@@ -0,0 +1,3 @@
+class AAA{}
+
+class BBB extends AAA implements <caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-7.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-7.java
new file mode 100644
index 000000000000..20b561ac6ce6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-7.java
@@ -0,0 +1,3 @@
+class AAA{}
+
+class BBB extends AAA i<caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-8-result.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-8-result.java
new file mode 100644
index 000000000000..37a271cd37b6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-8-result.java
@@ -0,0 +1,4 @@
+class AAA{}
+
+class BBB extends AAA implements <caret>{
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-8.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-8.java
new file mode 100644
index 000000000000..80dbed368970
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-8.java
@@ -0,0 +1,4 @@
+class AAA{}
+
+class BBB extends AAA i<caret> {
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-9-result.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-9-result.java
new file mode 100644
index 000000000000..0a95953cba7d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-9-result.java
@@ -0,0 +1 @@
+interface AAAA extends <caret>
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/extends-9.java b/java/java-tests/testData/codeInsight/completion/keywords/extends-9.java
new file mode 100644
index 000000000000..bd85a41f7537
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/extends-9.java
@@ -0,0 +1 @@
+interface AAAA e<caret>
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/fileScope-1.java b/java/java-tests/testData/codeInsight/completion/keywords/fileScope-1.java
new file mode 100644
index 000000000000..113fdcf80684
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/fileScope-1.java
@@ -0,0 +1 @@
+<caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/fileScope-2.java b/java/java-tests/testData/codeInsight/completion/keywords/fileScope-2.java
new file mode 100644
index 000000000000..faee6dcb6f1d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/fileScope-2.java
@@ -0,0 +1,3 @@
+package myPackage;
+
+<caret>
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/instanceof-1-result.java b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-1-result.java
new file mode 100644
index 000000000000..b86936886d2b
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-1-result.java
@@ -0,0 +1,5 @@
+public class A{
+ public void method(){
+  boolean x = this instanceof <caret>
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/instanceof-1.java b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-1.java
new file mode 100644
index 000000000000..0204407f2cb8
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-1.java
@@ -0,0 +1,5 @@
+public class A{
+ public void method(){
+  boolean x = this i<caret>
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/instanceof-2-result.java b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-2-result.java
new file mode 100644
index 000000000000..b42010d5d531
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-2-result.java
@@ -0,0 +1,5 @@
+public class A{
+ public void method(){
+  boolean x = super <caret>
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/instanceof-2.java b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-2.java
new file mode 100644
index 000000000000..b42010d5d531
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-2.java
@@ -0,0 +1,5 @@
+public class A{
+ public void method(){
+  boolean x = super <caret>
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/instanceof-3-result.java b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-3-result.java
new file mode 100644
index 000000000000..9bc7e1cd03ba
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-3-result.java
@@ -0,0 +1,6 @@
+public class A{
+ public void method(){
+  String str = "";
+  boolean x = str instanceof <caret>
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/instanceof-3.java b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-3.java
new file mode 100644
index 000000000000..4cb057454774
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/instanceof-3.java
@@ -0,0 +1,6 @@
+public class A{
+ public void method(){
+  String str = "";
+  boolean x = str i<caret>
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/methodScope-1.java b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-1.java
new file mode 100644
index 000000000000..640faaa19d11
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-1.java
@@ -0,0 +1,3 @@
+public class A{
+ public void method() <caret> {}
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/methodScope-2.java b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-2.java
new file mode 100644
index 000000000000..965cfb800962
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-2.java
@@ -0,0 +1,4 @@
+public class A{
+ public void method(<caret>){
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/methodScope-3.java b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-3.java
new file mode 100644
index 000000000000..dd99cb703a23
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-3.java
@@ -0,0 +1,5 @@
+public class A{
+ public void method(){
+  <caret>
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/methodScope-4.java b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-4.java
new file mode 100644
index 000000000000..dd99cb703a23
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-4.java
@@ -0,0 +1,5 @@
+public class A{
+ public void method(){
+  <caret>
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/methodScope-5-out.java b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-5-out.java
new file mode 100644
index 000000000000..1fdb38929526
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-5-out.java
@@ -0,0 +1,5 @@
+public class A{
+ public void method(final String){
+  
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/methodScope-5.java b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-5.java
new file mode 100644
index 000000000000..93adde13ad59
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/methodScope-5.java
@@ -0,0 +1,5 @@
+public class A{
+ public void method(fi<caret> String){
+  
+ }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/super-1.java b/java/java-tests/testData/codeInsight/completion/keywords/super-1.java
new file mode 100644
index 000000000000..4450560b5f94
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/super-1.java
@@ -0,0 +1,7 @@
+class B{
+ class A{
+  {
+   B.<caret>
+  }
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/super-2.java b/java/java-tests/testData/codeInsight/completion/keywords/super-2.java
new file mode 100644
index 000000000000..390b24a570d5
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/super-2.java
@@ -0,0 +1,5 @@
+class A{
+ {
+ String.<caret>
+ }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/synchronized-1-result.java b/java/java-tests/testData/codeInsight/completion/keywords/synchronized-1-result.java
new file mode 100644
index 000000000000..f9fb47045945
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/synchronized-1-result.java
@@ -0,0 +1,7 @@
+class A {
+  void foo () {
+    new Runnable () {
+      public synchronized <caret>
+    };
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/synchronized-1.java b/java/java-tests/testData/codeInsight/completion/keywords/synchronized-1.java
new file mode 100644
index 000000000000..692b71b7b8d1
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/synchronized-1.java
@@ -0,0 +1,7 @@
+class A {
+  void foo () {
+    new Runnable () {
+      public synch<caret>
+    };
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/synchronized-2-result.java b/java/java-tests/testData/codeInsight/completion/keywords/synchronized-2-result.java
new file mode 100644
index 000000000000..859333d08a32
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/synchronized-2-result.java
@@ -0,0 +1,6 @@
+class Test {
+    void foo() {
+        if (true) {
+        } else synchronized(<caret>)
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/synchronized-2.java b/java/java-tests/testData/codeInsight/completion/keywords/synchronized-2.java
new file mode 100644
index 000000000000..e2e5fe775cfb
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/synchronized-2.java
@@ -0,0 +1,6 @@
+class Test {
+    void foo() {
+        if (true) {
+        } else syn<caret>
+    }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/throwsOnSeparateLine.java b/java/java-tests/testData/codeInsight/completion/keywords/throwsOnSeparateLine.java
new file mode 100644
index 000000000000..cbff6138dd07
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/throwsOnSeparateLine.java
@@ -0,0 +1,5 @@
+
+public class Foo {
+  void foo()
+  th<caret>
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/throwsOnSeparateLine_after.java b/java/java-tests/testData/codeInsight/completion/keywords/throwsOnSeparateLine_after.java
new file mode 100644
index 000000000000..f0adeda05acf
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/throwsOnSeparateLine_after.java
@@ -0,0 +1,5 @@
+
+public class Foo {
+  void foo()
+  throws <caret>
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/tryInExpression.java b/java/java-tests/testData/codeInsight/completion/keywords/tryInExpression.java
new file mode 100644
index 000000000000..0e0753a27d8b
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/tryInExpression.java
@@ -0,0 +1,5 @@
+public class MessageBean {
+ {
+    String containingClass = ((String) t<caret>    
+ }
+}