azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to IDEA 13.1 (134.1007)

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-02-13 16:11:39 +04:00
parent 4c57aa9f23
commit 9f3b73986a
29 changed files with 133 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/compiler-tests.iml
+1
View File
@@ -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
+3
View File
@@ -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" />