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

[AA LC] Properly set type mapping mode for bounds of type parameters

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2022-08-10 15:13:17 +03:00
parent a3884e35e2
commit c67ded2d3b
8 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.fir.java
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final class TwoOverrides /* TwoOverrides*/ implements kotlin.collections.Iterable<java.lang.String> {
public final class TwoOverrides /* TwoOverrides*/ implements java.lang.Iterable<java.lang.String> {
@java.lang.Override()
@org.jetbrains.annotations.Nullable()
public java.lang.Void iterator();// iterator()
compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.fir.java
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/<TValue> implements kotlin.collections.Map<java.lang.Class<?>, TValue> {
public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/<TValue> implements java.util.Map<java.lang.Class<?>, TValue> {
@java.lang.Override()
public boolean containsKey(@org.jetbrains.annotations.NotNull() java.lang.Class<?>);// containsKey(java.lang.Class<?>)
compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.fir.java
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final class SmartSet /* SmartSet*/<T> extends kotlin.collections.AbstractSet<T> implements kotlin.collections.MutableSet<T> {
public final class SmartSet /* SmartSet*/<T> extends kotlin.collections.AbstractSet<T> implements java.util.Set<T> {
@org.jetbrains.annotations.NotNull()
public static final SmartSet.Companion Companion;
compiler/testData/asJava/ultraLightClasses/generics.fir.java
Vendored
+2 -2
View File
@@ -33,7 +33,7 @@ public abstract class C /* C*/<T> {
public final java.util.List<java.lang.CharSequence> getConstructorParam();// getConstructorParam()
@org.jetbrains.annotations.Nullable()
public final <T extends java.lang.Comparable<T>> T max(@org.jetbrains.annotations.Nullable() java.util.Collection<? extends T>);// <T extends java.lang.Comparable<T>> max(java.util.Collection<? extends T>)
public final <T extends java.lang.Comparable<? super T>> T max(@org.jetbrains.annotations.Nullable() java.util.Collection<? extends T>);// <T extends java.lang.Comparable<? super T>> max(java.util.Collection<? extends T>)
@org.jetbrains.annotations.Nullable()
public final java.util.HashSet<java.lang.String> getSHashSetProp();// getSHashSetProp()
@@ -70,7 +70,7 @@ public abstract class C /* C*/<T> {
}
public class K /* K*/<T extends K<T>> {
public class K /* K*/<T extends K<? extends T>> {
public K();// .ctor()
}
compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.fir.java
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
public final class MyList /* MyList*/ implements kotlin.collections.List<java.lang.String> {
public final class MyList /* MyList*/ implements java.util.List<java.lang.String> {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.lang.String get(int);// get(int)
@@ -7,7 +7,7 @@ public final class MyList /* MyList*/ implements kotlin.collections.List<java.la
}
public abstract interface ASet /* ASet*/<T> extends kotlin.collections.MutableCollection<T> {
public abstract interface ASet /* ASet*/<T> extends java.util.Collection<T> {
}
public abstract class MySet /* MySet*/<T> implements ASet<T> {