Update to IDEA 13.1 (134.1007)

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/MockPsiDocumentManager.java

@@ -67,8 +67,10 @@ public class MockPsiDocumentManager extends PsiDocumentManager {
     public void commitDocument(@NotNull Document document) {
     }
 
+    @NotNull
+    @Override
     public CharSequence getLastCommittedText(@NotNull Document document) {
-        return document.getText();
+        return document.getImmutableCharSequence();
     }
 
     @Override

compiler/testData/asJava/nullabilityAnnotations/Generic.java

@@ -1,4 +1,4 @@
-public interface Generic <N, NN>  extends jet.JetObject {
+public interface Generic <N, NN> extends jet.JetObject {
     N a(@jet.runtime.typeinfo.JetValueParameter(name = "n") N n);
 
     @org.jetbrains.annotations.NotNull

compiler/testData/resolve/ResolveToJava2.resolve

@@ -8,7 +8,7 @@ import java.`java::java.util`util.*
 fun <T> t(t : T) : T {
   `c`c(java.lang.Integer(1))
   System.out.`java::java.io.PrintStream.print(Object)`print(t)
-  System.out.`java::java.io.PrintStream.print(char[])`print(null : CharArray?)
+  System.out.`java::java.io.PrintStream.print(char[])`print(null : CharArray)
   System.out.`java::java.io.PrintStream.print(Object)`print(null : Object?)
   System.out.`java::java.io.PrintStream.print(Int)`print(1)
   System.out.`java::java.io.PrintStream.print(Double)`print(1.0)

compiler/tests/compiler-tests.iml

@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="descriptor.loader.java" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="builtins-serializer" />
+    <orderEntry type="library" name="hamcrest-core-1.3" level="project" />
   </component>
 </module>
 

compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java

@@ -78,6 +78,9 @@ public class IdeaJdkAnnotationsReflectedTest extends KotlinTestWithEnvironment {
         for (FqName classFqName : JdkAnnotationsValidityTest.getAffectedClasses("jar://ideaSDK/lib/jdkAnnotations.jar!/")) {
             if (new FqName("org.jdom").equals(classFqName.parent())) continue; // filter unrelated jdom annotations
             if (new FqName("java.util.concurrent.TransferQueue").equals(classFqName)) continue; // filter JDK7-specific class
+            if (new FqName("java.util.Objects").equals(classFqName)) continue; // filter JDK7-specific class
+            if (new FqName("java.nio.file.Files").equals(classFqName)) continue; // filter JDK7-specific class
+            if (new FqName("java.nio.file.Paths").equals(classFqName)) continue; // filter JDK7-specific class
             // the following idea annotation is incorrect
             // <item name="java.io.StringWriter void write(java.lang.String) 0">
             // <annotation name="org.jetbrains.annotations.NotNull" />