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

KT-3200 wrong Kotlin signature java.util.concurrent.ThreadFactory java.lang.Thread newThread(java.lang.Runnable)

Browse Source 
Added checking for compatibility of IDEA's and Kotlin's JDK annotations.

 #KT-3200 fixed
This commit is contained in:
Evgeny Gerashchenko
2013-01-14 19:00:21 +04:00
parent fa08289706
commit b1fd1d8301
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java
+7 -2
View File
@@ -32,8 +32,10 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.TestJdkKind;
import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.di.InjectorForJavaSemanticServices; import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -44,6 +46,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -56,8 +59,10 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase {
private static final int CLASSES_IN_CHUNK = 500; private static final int CLASSES_IN_CHUNK = 500;
private static JetCoreEnvironment createEnvironment(Disposable parentDisposable) { private static JetCoreEnvironment createEnvironment(Disposable parentDisposable) {
return JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(
parentDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.FULL_JDK); ConfigurationKind.JDK_AND_ANNOTATIONS, TestJdkKind.FULL_JDK, JetTestUtils.getAnnotationsJar());
configuration.add(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File("ideaSDK/lib/jdkAnnotations.jar"));
return new JetCoreEnvironment(parentDisposable, configuration);
} }
public void testNoErrorsInAlternativeSignatures() { public void testNoErrorsInAlternativeSignatures() {
jdk-annotations/java/util/concurrent/annotations.xml
+2 -2
View File
@@ -746,7 +746,7 @@
</item> </item>
<item name='java.util.concurrent.ThreadFactory java.lang.Thread newThread(java.lang.Runnable)'> <item name='java.util.concurrent.ThreadFactory java.lang.Thread newThread(java.lang.Runnable)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'> <annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun newThread(r : Runnable) : Thread?&quot;"/> <val name="value" val="&quot;fun newThread(r : Runnable) : Thread&quot;"/>
</annotation> </annotation>
</item> </item>
<item name='java.util.concurrent.Executor void execute(java.lang.Runnable)'> <item name='java.util.concurrent.Executor void execute(java.lang.Runnable)'>
@@ -1415,7 +1415,7 @@
</item> </item>
<item name='java.util.concurrent.ExecutorService T invokeAny(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;)'> <item name='java.util.concurrent.ExecutorService T invokeAny(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'> <annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun &lt;T&gt; invokeAny(tasks : Collection&lt;Callable&lt;T&gt;&gt;) : T?&quot;"/> <val name="value" val="&quot;fun &lt;T&gt; invokeAny(tasks : Collection&lt;Callable&lt;T&gt;&gt;) : T&quot;"/>
</annotation> </annotation>
</item> </item>
<item name='java.util.concurrent.ForkJoinPool java.lang.String toString()'> <item name='java.util.concurrent.ForkJoinPool java.lang.String toString()'>