Merge remote-tracking branch 'origin/master'

Conflicts:
	compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java

idea/testData/checker/Bounds.jet

@@ -24,17 +24,3 @@ namespace boundsWithSubstitutors {
     abstract val x : fun (B<<error>Char</error>>) : B<<error>Any</error>>
   }
 
-
-fun test() {
-    foo<<error>Int?</error>>()
-    foo<Int>()
-    bar<Int?>()
-    bar<Int>()
-    bar<<error>Double?</error>>()
-    bar<<error>Double</error>>()
-    1.buzz<<error>Double</error>>()
-}
-
-fun foo<T : Any>() {}
-fun bar<T : Int?>() {}
-fun <T : <warning>Int</warning>> Int.buzz() : Unit {}

idea/testData/checker/Bounds2.jet

@@ -0,0 +1,13 @@
+fun test() {
+    foo<<error>Int?</error>>()
+    foo<Int>()
+    bar<Int?>()
+    bar<Int>()
+    bar<<error>Double?</error>>()
+    bar<<error>Double</error>>()
+    1.buzz<<error>Double</error>>()
+}
+
+fun foo<T : Any>() {}
+fun bar<T : Int?>() {}
+fun <T : <warning>Int</warning>> Int.buzz() : Unit {}

idea/testData/completion/basic/ExtendClassName.kt

@@ -0,0 +1,13 @@
+open class MySecondClass() {
+}
+
+open class MyFirstClass<T> {
+
+}
+
+class A() : My<caret> {
+    public fun test() {
+    }
+}
+
+// EXIST: MySecondClass, MyFirstClass

idea/testData/completion/basic/ExtendQualifiedClassName.kt

@@ -0,0 +1,11 @@
+namespace Test.SubTest.AnotherTest
+
+open class TestClass {
+}
+
+class A() : Test.SubTest.AnotherTest.Te<caret> {
+    public fun test() {
+    }
+}
+
+// EXIST: TestClass

idea/testData/completion/basic/VariableClassName.kt

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