Merge branch 'master' of ssh://git.labs.intellij.net/jet

compiler/testData/checkerWithErrorTypes/quick/ExtensionsCalledOnSuper.jet

@@ -16,6 +16,6 @@ class C : T {
         super.foo() // OK
         <!SUPER_IS_NOT_AN_EXPRESSION!>super<!>.bar() // Error
         super.buzz() // OK, resolved to a member
-        super.<!NO_VALUE_FOR_PARAMETER!>buzz1<!>() // Resolved to a member, but error: no parameter passed where required
+        super.buzz1<!NO_VALUE_FOR_PARAMETER!>()<!> // Resolved to a member, but error: no parameter passed where required
     }
 }

compiler/testData/checkerWithErrorTypes/quick/FunctionCalleeExpressions.jet

@@ -0,0 +1,50 @@
+namespace foo
+
+fun Any.foo() : fun() : Unit {
+  return {}
+}
+
+fun Any.foo1() : fun(i : Int) : Unit {
+  return {}
+}
+
+fun foo2() : fun(i : fun()) : Unit {
+  return {}
+}
+
+fun fooT1<T>(t : T) : fun() : T {
+  return {t}
+}
+
+fun fooT2<T>() : fun(t : T) : T {
+  return {it}
+}
+
+fun main(args : Array<String>) {
+    args.foo()()
+    args.foo1()<!NO_VALUE_FOR_PARAMETER!>()<!>
+    <!UNRESOLVED_REFERENCE!>a<!>.foo1()()
+    <!UNRESOLVED_REFERENCE!>a<!>.foo1()(<!UNRESOLVED_REFERENCE!>a<!>)
+
+    args.foo1()(1)
+    args.foo1()(<!TYPE_MISMATCH!>"1"<!>)
+    <!UNRESOLVED_REFERENCE!>a<!>.foo1()("1")
+    <!UNRESOLVED_REFERENCE!>a<!>.foo1()(<!UNRESOLVED_REFERENCE!>a<!>)
+
+    foo2()({})
+    foo2()<!TOO_MANY_ARGUMENTS!>{}<!>
+    (foo2()){}
+    (foo2())<!TYPE_MISMATCH!>{<!CANNOT_INFER_PARAMETER_TYPE!>x<!> => }<!>
+    foo2()(<!TYPE_MISMATCH!>{<!CANNOT_INFER_PARAMETER_TYPE!>x<!> => }<!>)
+
+    val a = fooT1(1)()
+    a : Int
+
+    val b = fooT2<Int>()(1)
+    b : Int
+    fooT2()(1) // : Any?
+
+    <!CALLEE_NOT_A_FUNCTION!>1<!>()
+    <!CALLEE_NOT_A_FUNCTION!>1<!>{}
+    <!CALLEE_NOT_A_FUNCTION!>1<!>(){}
+}

compiler/testData/checkerWithErrorTypes/quick/NamedArgumentsAndDefaultValues.jet

@@ -14,10 +14,10 @@ fun test() {
     foo(1, "", <!TOO_MANY_ARGUMENTS!>""<!>)
 
     bar(z = "")
-    <!NO_VALUE_FOR_PARAMETER!>bar<!>()
-    <!NO_VALUE_FOR_PARAMETER!>bar<!>("")
+    bar<!NO_VALUE_FOR_PARAMETER!>()<!>
+    bar<!NO_VALUE_FOR_PARAMETER!>("")<!>
     bar(1, 1, "")
     bar(1, 1, "")
     bar(1, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>z<!> = "")
-    <!NO_VALUE_FOR_PARAMETER!>bar<!>(1, <!UNRESOLVED_REFERENCE, MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>zz<!> = "", <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!><!UNRESOLVED_REFERENCE!>zz<!>.foo<!>)
+    bar<!NO_VALUE_FOR_PARAMETER!>(1, <!UNRESOLVED_REFERENCE, MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>zz<!> = "", <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!><!UNRESOLVED_REFERENCE!>zz<!>.foo<!>)<!>
 }

compiler/testData/codegen/regressions/kt33.jet

@@ -0,0 +1,6 @@
+fun box () : String {
+    val s = java.util.ArrayList<String>()
+    s.add("foo")
+    s[0] += "bar"
+    return if(s[0] == "foobar") "OK" else "fail"
+}

compiler/testData/compiler/smoke/Smoke.kt

@@ -0,0 +1,4 @@
+namespace Smoke
+
+fun main(args: Array<String>) {
+}

compiler/testData/compiler/smoke/Smoke.kts

@@ -0,0 +1,8 @@
+import kotlin.modules.ModuleSetBuilder
+
+fun ModuleSetBuilder.defineModules() {
+    module("smoke") {
+        source files "Smoke.kt"
+        jar name System.getProperty("java.io.tmpdir") + "/smoke.jar"
+    }
+}