jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-05 08:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIR: make rendering of type parameters similar to original Kotlin

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-04-09 15:32:59 +03:00
parent 0c334163ab
commit 568e831651
178 changed files with 278 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<P> public final class ClassWithTypeP : R|java/lang/Object| {
public final class ClassWithTypeP<P> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<P> public abstract class ClassWithTypePExtendsIterableP : R|java/lang/Object|, R|java/lang/Iterable<P>| {
public abstract class ClassWithTypePExtendsIterableP<P> : R|java/lang/Object|, R|java/lang/Iterable<P>| {
}

2
compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<P, Q> public final class ClassWithTypePP : R|java/lang/Object| {
public final class ClassWithTypePP<P, Q> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<R, P> public open class ClassWithTypePRefNext : R|java/lang/Object| {
public open class ClassWithTypePRefNext<R, P> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<P> public final class ClassWithTypePRefSelf : R|java/lang/Object| {
public final class ClassWithTypePRefSelf<P> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<P> public final class ClassWithTypePRefSelfAndClass : R|java/lang/Object| {
public final class ClassWithTypePRefSelfAndClass<P> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<P> public open class InnerClassReferencesOuterTP : R|java/lang/Object| {
public open class InnerClassReferencesOuterTP<P> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<P, Q> public open class InnerClassesInGeneric : R|java/lang/Object| {
public open class InnerClassesInGeneric<P, Q> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<P> public final class MethodReferencesOuterClassTP : R|java/lang/Object| {
public final class MethodReferencesOuterClassTP<P> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<P> public open class MethodWithTypePRefClassP : R|java/lang/Object| {
public open class MethodWithTypePRefClassP<P> : R|java/lang/Object| {
public final operator fun f(): R|kotlin/Unit|
}

2
compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<T> public abstract interface RawUpperBound : R|java/lang/Object| {
public abstract interface RawUpperBound<T> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<T> public abstract interface RecursiveRawUpperBound : R|java/lang/Object| {
public abstract interface RecursiveRawUpperBound<T> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<T> public abstract interface RecursiveWildcardUpperBound : R|java/lang/Object| {
public abstract interface RecursiveWildcardUpperBound<T> : R|java/lang/Object| {
}

2
compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<P> public open class JavaBeanVarOfGenericType : R|java/lang/Object| {
public open class JavaBeanVarOfGenericType<P> : R|java/lang/Object| {
public open operator fun getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!
public open operator fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!): R|kotlin/Unit|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public open class ConstructorWithNewTypeParams : R|java/lang/Object| {
public open class ConstructorWithNewTypeParams<T> : R|java/lang/Object| {
public final fun ConstructorWithNewTypeParams(first: R|ft<U, U?>|!): R|test/ConstructorWithNewTypeParams|
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public open class ConstructorWithParentTypeParams : R|java/lang/Object| {
public open class ConstructorWithParentTypeParams<T> : R|java/lang/Object| {
public final fun ConstructorWithParentTypeParams(first: R|ft<T, T?>|!): R|test/ConstructorWithParentTypeParams|
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public open class PropertyArrayTypes : R|java/lang/Object| {
public open class PropertyArrayTypes<T> : R|java/lang/Object| {
public open var arrayOfArrays: R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|
public get(): R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|
public set(value: R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|): kotlin/Unit

2
compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public open class PropertyComplexTypes : R|java/lang/Object| {
public open class PropertyComplexTypes<T> : R|java/lang/Object| {
public open var genericType: R|ft<T, T?>|!
public get(): R|ft<T, T?>|!
public set(value: R|ft<T, T?>|!): kotlin/Unit

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<E> public abstract interface SubclassOfCollection : R|java/util/Collection<E>| {
public abstract interface SubclassOfCollection<E> : R|java/util/Collection<E>| {
public abstract operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<E, E?>>, kotlin/collections/Iterator<ft<E, E?>>?>|!
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<K, V> public abstract interface SubclassOfMapEntry : R|java/util/Map.Entry<K, V>| {
public abstract interface SubclassOfMapEntry<K, V> : R|java/util/Map.Entry<K, V>| {
public abstract operator fun setValue(value: R|ft<V, V?>|!): R|ft<V, V?>|!
public abstract operator fun setValue(<anonymous Java parameter>: R|ft<V, V?>|!): R|ft<V, V?>|!

2
compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public abstract interface LoadIterable : R|java/lang/Object| {
public abstract interface LoadIterable<T> : R|java/lang/Object| {
public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
public abstract operator fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|

2
compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public abstract interface LoadIterator : R|java/lang/Object| {
public abstract interface LoadIterator<T> : R|java/lang/Object| {
public abstract operator fun getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!
public abstract operator fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!): R|kotlin/Unit|

2
compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public abstract interface LoadIterable : R|java/lang/Object| {
public abstract interface LoadIterable<T> : R|java/lang/Object| {
@R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!
public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!): R|kotlin/Unit|

2
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public abstract interface LoadIterableWithConflict : R|java/lang/Object| {
public abstract interface LoadIterableWithConflict<T> : R|java/lang/Object| {
@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
public abstract operator fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|

2
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public abstract interface LoadIterableWithNullability : R|java/lang/Object| {
public abstract interface LoadIterableWithNullability<T> : R|java/lang/Object| {
@R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>>|
public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>>|): R|kotlin/Unit|

2
compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public abstract interface Comparator : R|java/lang/Object| {
public abstract interface Comparator<T> : R|java/lang/Object| {
public abstract operator fun compare(o1: R|ft<T, T?>|!, o2: R|ft<T, T?>|!): R|kotlin/Int|
public abstract operator fun equals(obj: R|ft<kotlin/Any, kotlin/Any?>|!): R|kotlin/Boolean|

2
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public abstract interface GenericInterfaceParameterWithSelfBound : R|java/lang/Object| {
public abstract interface GenericInterfaceParameterWithSelfBound<T> : R|java/lang/Object| {
public abstract operator fun method(t: R|ft<T, T?>|!): R|ft<T, T?>|!
}

2
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<A, B> public abstract interface GenericInterfaceParametersWithBounds : R|java/lang/Object| {
public abstract interface GenericInterfaceParametersWithBounds<A, B> : R|java/lang/Object| {
public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
}

2
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt vendored
View File

@@ -1,4 +1,4 @@
<T> public open class TypeParameterOfClass : R|java/lang/Object| {
public open class TypeParameterOfClass<T> : R|java/lang/Object| {
public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
}

2
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt vendored
View File

@@ -1,2 +1,2 @@
<T> public open class TypeParameterOfOuterClass : R|java/lang/Object| {
public open class TypeParameterOfOuterClass<T> : R|java/lang/Object| {
}