Merge remote-tracking branch 'origin/master'

idea/testData/completion/basic/FromImports.kt

@@ -0,0 +1,9 @@
+namespace Tests
+
+import java.util.*
+
+fun hello() {
+    val a = So<caret>
+}
+
+// EXIST: SortedSet, SortedMap

idea/testData/completion/basic/JavaPackage.kt

@@ -0,0 +1,6 @@
+namespace Tests
+
+class A : java.<caret>
+
+// EXIST: lang, util, io
+// ABSENT: fun, val, var, namespace

idea/testData/completion/basic/VariableClassName.kt

@@ -1,10 +1,10 @@
 open class MyClass() {
 }
 
-class A() : My<caret> {
+class A() {
     public fun test() {
         val a : MyC<caret>
     }
 }
 
-// EXIST: MyClass
+// EXIST: MyClass

idea/testData/completion/keywords/InTypeScope.kt

@@ -3,4 +3,4 @@ fun foo() {
 }
 
 // TODO: Move all keywords to absent
-// EXPECT: fun, val, var, namespace
+// EXIST: fun, val, var, namespace

idea/testData/completion/keywords/TopScope.kt

@@ -1,8 +1,8 @@
 <caret>
 
-// EXPECT: namespace, as, type, class, this, super, val, var, fun, for, null, true
-// EXPECT: false, is, in, throw, return, break, continue, object, if, try, else, while
-// EXPECT: do, when, trait, This
-// EXPECT: import, where, by, get, set, abstract, enum, open, annotation, override, private
-// EXPECT: public, internal, protected, catch, out, vararg, inline, finally, final, ref
+// EXIST: namespace, as, type, class, this, super, val, var, fun, for, null, true
+// EXIST: false, is, in, throw, return, break, continue, object, if, try, else, while
+// EXIST: do, when, trait, This
+// EXIST: import, where, by, get, set, abstract, enum, open, annotation, override, private
+// EXIST: public, internal, protected, catch, out, vararg, inline, finally, final, ref
 // ABSENT: ?in, new, extends, implements