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

Fixed misused "variance" word.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-02-15 19:14:11 +04:00
parent 19bc28b29d
commit 1de5da1e8a
9 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/kotlinSignature/CustomVariance.java → compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.util.*;
import jet.runtime.typeinfo.KotlinSignature;
public class CustomVariance {
public class CustomProjectionKind {
@KotlinSignature("fun foo(): MutableList<out Number>")
public List<Number> foo() {
throw new UnsupportedOperationException();
compiler/testData/loadJava/kotlinSignature/CustomVariance.kt → compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.kt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
import java.util.*
public open class CustomVariance : Object() {
public open class CustomProjectionKind : Object() {
public open fun foo() : MutableList<out Number> = throw UnsupportedOperationException()
}
compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.txt
+6
View File
@@ -0,0 +1,6 @@
package test
public open class CustomProjectionKind : java.lang.Object {
public constructor CustomProjectionKind()
public open fun foo() : jet.MutableList<out jet.Number>
}
compiler/testData/loadJava/kotlinSignature/CustomVariance.txt
-6
View File
@@ -1,6 +0,0 @@
package test
public open class CustomVariance : java.lang.Object {
public constructor CustomVariance()
public open fun foo() : jet.MutableList<out jet.Number>
}
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.java → compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.java
+1 -1
View File
@@ -6,7 +6,7 @@ import java.util.Collection;
import jet.runtime.typeinfo.KotlinSignature;
public interface InheritVariance {
public interface InheritProjectionKind {
public interface Super {
@KotlinSignature("fun foo(): MutableCollection<out Number>")
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.kt → compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public trait InheritVariance: Object {
public trait InheritProjectionKind: Object {
public trait Super: Object {
public fun foo(): MutableCollection<out Number>
compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt → compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
+2 -2
View File
@@ -1,8 +1,8 @@
package test
public trait InheritVariance : java.lang.Object {
public trait InheritProjectionKind : java.lang.Object {
public trait Sub : test.InheritVariance.Super {
public trait Sub : test.InheritProjectionKind.Super {
public abstract override /*1*/ fun foo() : jet.MutableList<out jet.Number>
}
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+8 -8
View File
@@ -283,9 +283,9 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.java");
}
@TestMetadata("CustomVariance.java")
public void testCustomVariance() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/CustomVariance.java");
@TestMetadata("CustomProjectionKind.java")
public void testCustomProjectionKind() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.java");
}
@TestMetadata("MethodWithFunctionTypes.java")
@@ -697,6 +697,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java");
}
@TestMetadata("InheritProjectionKind.java")
public void testInheritProjectionKind() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.java");
}
@TestMetadata("InheritReadOnlinessOfArgument.java")
public void testInheritReadOnlinessOfArgument() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java");
@@ -712,11 +717,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java");
}
@TestMetadata("InheritVariance.java")
public void testInheritVariance() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.java");
}
@TestMetadata("SameProjectionKind.java")
public void testSameProjectionKind() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.java");
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+8 -8
View File
@@ -1252,9 +1252,9 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.kt");
}
@TestMetadata("CustomVariance.kt")
public void testCustomVariance() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/CustomVariance.kt");
@TestMetadata("CustomProjectionKind.kt")
public void testCustomProjectionKind() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.kt");
}
@TestMetadata("MethodWithFunctionTypes.kt")
@@ -1666,6 +1666,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt");
}
@TestMetadata("InheritProjectionKind.kt")
public void testInheritProjectionKind() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt");
}
@TestMetadata("InheritReadOnlinessOfArgument.kt")
public void testInheritReadOnlinessOfArgument() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt");
@@ -1681,11 +1686,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt");
}
@TestMetadata("InheritVariance.kt")
public void testInheritVariance() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.kt");
}
@TestMetadata("SameProjectionKind.kt")
public void testSameProjectionKind() throws Exception {
doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.kt");