Merge remote branch 'origin/master'

Conflicts: idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java
2011-09-06 12:14:07 +04:00
parent abfbe52a5a 2c25a0e46a
commit fc4ee1ab13
13 changed files with 224 additions and 55 deletions
@@ -47,6 +47,12 @@ public class PatternMatchingTest extends CodegenTestCase {
        assertEquals("something", foo.invoke(null, 19));
    }

+    public void testIs() throws Exception {
+        loadFile();
+        blackBox();
+        System.out.println(generateToText());
+    }
+
    public void testRange() throws Exception {
        loadFile();
        System.out.println(generateToText());