Merge remote branch 'origin/master'

Conflicts:
	idea/src/org/jetbrains/jet/lang/resolve/BindingContext.java
	idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java

idea/tests/org/jetbrains/jet/codegen/ArrayGenTestCase.java

@@ -0,0 +1,7 @@
+package org.jetbrains.jet.codegen;
+
+public class ArrayGenTestCase extends CodegenTestCase {
+    public void testKt238 () throws Exception {
+        blackBoxFile("regressions/kt238.jet");
+    }
+}

idea/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java

@@ -0,0 +1,9 @@
+package org.jetbrains.jet.codegen;
+
+import java.util.List;
+
+public class BridgeMethodGenTest extends CodegenTestCase {
+    public void testBridgeMethod () throws Exception {
+        blackBoxFile("bridge.jet");
+    }
+}

idea/tests/org/jetbrains/jet/codegen/CodegenTestCase.java

@@ -89,9 +89,9 @@ public abstract class CodegenTestCase extends LightCodeInsightFixtureTestCase {
         final JetNamespace namespace = jetFile.getRootNamespace();
         String fqName = NamespaceCodegen.getJVMClassName(namespace.getFQName()).replace("/", ".");
         Class<?> namespaceClass = loader.loadClass(fqName);
-        Method method = namespaceClass.getMethod("box");
-        return (String) method.invoke(null);
-    }
+            Method method = namespaceClass.getMethod("box");
+            return (String) method.invoke(null);
+        }
 
     protected String generateToText() {
         GenerationState state = new GenerationState(getProject(), true);

idea/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java

@@ -259,5 +259,19 @@ public class PrimitiveTypesTest extends CodegenTestCase {
         assertEquals(expected, main.invoke(null, arg1, arg2));
     }
 
+    public void testKt242 () throws Exception {
+        blackBoxFile("regressions/kt242.jet");
+    }
 
+    public void testKt239 () throws Exception {
+        blackBoxFile("regressions/kt242.jet");
+    }
+
+    public void testKt243 () throws Exception {
+        blackBoxFile("regressions/kt243.jet");
+    }
+
+    public void testKt248 () throws Exception {
+        blackBoxFile("regressions/kt248.jet");
+    }
 }

idea/tests/org/jetbrains/jet/codegen/PropertyGenTest.java

@@ -130,4 +130,8 @@ public class PropertyGenTest extends CodegenTestCase {
         final Class aClass = loadClass("Foo", codegens);
         assertNotNull(aClass.getMethod("getX"));
     }
+
+    public void testKt257 () throws Exception {
+        blackBoxFile("regressions/kt257.jet");
+    }
 }

idea/tests/org/jetbrains/jet/codegen/SafeRefTest.java

@@ -0,0 +1,15 @@
+package org.jetbrains.jet.codegen;
+
+public class SafeRefTest extends CodegenTestCase {
+    public void test247 () throws Exception {
+        blackBoxFile("regressions/kt247.jet");
+    }
+
+    public void test245 () throws Exception {
+        blackBoxFile("regressions/kt245.jet");
+    }
+
+    public void test232 () throws Exception {
+        blackBoxFile("regressions/kt232.jet");
+    }
+}

idea/tests/org/jetbrains/jet/codegen/TypeInfoTest.java

@@ -128,5 +128,10 @@ public class TypeInfoTest extends CodegenTestCase {
             }
         };
     }
+
+    public void testKt259() throws Exception {
+        blackBoxFile("regressions/kt259.jet");
+    }
+
 }