azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions 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
compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
Vendored
+16 -16
View File
@@ -25,7 +25,7 @@ public abstract class CharIterator : R|kotlin/collections/Iterator<kotlin/Char>|
}
<E> public abstract interface Collection : R|kotlin/collections/Iterable<E>| {
public abstract interface Collection<E> : R|kotlin/collections/Iterable<E>| {
public abstract operator fun contains(element: R|E|): R|kotlin/Boolean|
public abstract fun containsAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -63,19 +63,19 @@ public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
}
<T> public abstract interface Iterable : R|kotlin/Any| {
public abstract interface Iterable<T> : R|kotlin/Any| {
public abstract operator fun iterator(): R|kotlin/collections/Iterator<T>|
}
<T> public abstract interface Iterator : R|kotlin/Any| {
public abstract interface Iterator<T> : R|kotlin/Any| {
public abstract operator fun hasNext(): R|kotlin/Boolean|
public abstract operator fun next(): R|T|
}
<E> public abstract interface List : R|kotlin/collections/Collection<E>| {
public abstract interface List<E> : R|kotlin/collections/Collection<E>| {
public abstract operator fun contains(element: R|E|): R|kotlin/Boolean|
public abstract fun containsAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -98,7 +98,7 @@ public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
}
<T> public abstract interface ListIterator : R|kotlin/collections/Iterator<T>| {
public abstract interface ListIterator<T> : R|kotlin/collections/Iterator<T>| {
public abstract operator fun hasNext(): R|kotlin/Boolean|
public abstract fun hasPrevious(): R|kotlin/Boolean|
@@ -122,7 +122,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
}
<K, V> public abstract interface Map : R|kotlin/Any| {
public abstract interface Map<K, V> : R|kotlin/Any| {
public abstract fun containsKey(key: R|K|): R|kotlin/Boolean|
public abstract fun containsValue(value: R|V|): R|kotlin/Boolean|
@@ -133,12 +133,12 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
public abstract fun isEmpty(): R|kotlin/Boolean|
<K, V> public abstract interface Entry : R|kotlin/Any| {
public abstract interface Entry<K, V> : R|kotlin/Any| {
}
}
<E> public abstract interface MutableCollection : R|kotlin/collections/Collection<E>|, R|kotlin/collections/MutableIterable<E>| {
public abstract interface MutableCollection<E> : R|kotlin/collections/Collection<E>|, R|kotlin/collections/MutableIterable<E>| {
public abstract fun add(element: R|E|): R|kotlin/Boolean|
public abstract fun addAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -155,17 +155,17 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
}
<T> public abstract interface MutableIterable : R|kotlin/collections/Iterable<T>| {
public abstract interface MutableIterable<T> : R|kotlin/collections/Iterable<T>| {
public abstract operator fun iterator(): R|kotlin/collections/MutableIterator<T>|
}
<T> public abstract interface MutableIterator : R|kotlin/collections/Iterator<T>| {
public abstract interface MutableIterator<T> : R|kotlin/collections/Iterator<T>| {
public abstract fun remove(): R|kotlin/Unit|
}
<E> public abstract interface MutableList : R|kotlin/collections/List<E>|, R|kotlin/collections/MutableCollection<E>| {
public abstract interface MutableList<E> : R|kotlin/collections/List<E>|, R|kotlin/collections/MutableCollection<E>| {
public abstract fun add(element: R|E|): R|kotlin/Boolean|
public abstract fun add(index: R|kotlin/Int|, element: R|E|): R|kotlin/Unit|
@@ -194,7 +194,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
}
<T> public abstract interface MutableListIterator : R|kotlin/collections/ListIterator<T>|, R|kotlin/collections/MutableIterator<T>| {
public abstract interface MutableListIterator<T> : R|kotlin/collections/ListIterator<T>|, R|kotlin/collections/MutableIterator<T>| {
public abstract fun add(element: R|T|): R|kotlin/Unit|
public abstract operator fun hasNext(): R|kotlin/Boolean|
@@ -207,7 +207,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
}
<K, V> public abstract interface MutableMap : R|kotlin/collections/Map<K, V>| {
public abstract interface MutableMap<K, V> : R|kotlin/collections/Map<K, V>| {
public abstract fun clear(): R|kotlin/Unit|
public abstract fun put(key: R|K|, value: R|V|): R|V|
@@ -218,14 +218,14 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
public open fun remove(key: R|K|, value: R|V|): R|kotlin/Boolean|
<K, V> public abstract interface MutableEntry : R|kotlin/collections/Map.Entry<K, V>| {
public abstract interface MutableEntry<K, V> : R|kotlin/collections/Map.Entry<K, V>| {
public abstract fun setValue(newValue: R|V|): R|V|
}
}
<E> public abstract interface MutableSet : R|kotlin/collections/Set<E>|, R|kotlin/collections/MutableCollection<E>| {
public abstract interface MutableSet<E> : R|kotlin/collections/Set<E>|, R|kotlin/collections/MutableCollection<E>| {
public abstract fun add(element: R|E|): R|kotlin/Boolean|
public abstract fun addAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -242,7 +242,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
}
<E> public abstract interface Set : R|kotlin/collections/Collection<E>| {
public abstract interface Set<E> : R|kotlin/collections/Collection<E>| {
public abstract operator fun contains(element: R|E|): R|kotlin/Boolean|
public abstract fun containsAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
Vendored
+1 -1
View File
@@ -49,7 +49,7 @@ public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges
}
<T> public abstract interface ClosedRange : R|kotlin/Any| {
public abstract interface ClosedRange<T> : R|kotlin/Any| {
public open operator fun contains(value: R|T|): R|kotlin/Boolean|
public open fun isEmpty(): R|kotlin/Boolean|
compiler/fir/resolve/testData/builtIns/kotlin.txt
Vendored
+9 -9
View File
@@ -1,6 +1,6 @@
<T> public final inline fun arrayOf(vararg elements: R|kotlin/Array<out T>|): R|kotlin/Array<T>|
public final inline fun <T> arrayOf(vararg elements: R|kotlin/Array<out T>|): R|kotlin/Array<T>|
<T> public final fun arrayOfNulls(size: R|kotlin/Int|): R|kotlin/Array<T>|
public final fun <T> arrayOfNulls(size: R|kotlin/Int|): R|kotlin/Array<T>|
public final fun booleanArrayOf(vararg elements: R|kotlin/BooleanArray|): R|kotlin/BooleanArray|
@@ -10,11 +10,11 @@ public final fun charArrayOf(vararg elements: R|kotlin/CharArray|): R|kotlin/Cha
public final fun doubleArrayOf(vararg elements: R|kotlin/DoubleArray|): R|kotlin/DoubleArray|
<T> public final inline fun emptyArray(): R|kotlin/Array<T>|
public final inline fun <T> emptyArray(): R|kotlin/Array<T>|
<T> public final inline fun enumValueOf(name: R|kotlin/String|): R|T|
public final inline fun <T> enumValueOf(name: R|kotlin/String|): R|T|
<T> public final inline fun enumValues(): R|kotlin/Array<T>|
public final inline fun <T> enumValues(): R|kotlin/Array<T>|
public final fun floatArrayOf(vararg elements: R|kotlin/FloatArray|): R|kotlin/FloatArray|
@@ -42,7 +42,7 @@ public open class Any {
}
<T> public final class Array : R|kotlin/Any| {
public final class Array<T> : R|kotlin/Any| {
public final operator fun get(index: R|kotlin/Int|): R|T|
public final operator fun iterator(): R|kotlin/collections/Iterator<T>|
@@ -286,7 +286,7 @@ public abstract interface Cloneable : R|kotlin/Any| {
}
<T> public abstract interface Comparable : R|kotlin/Any| {
public abstract interface Comparable<T> : R|kotlin/Any| {
public abstract operator fun compareTo(other: R|T|): R|kotlin/Int|
}
@@ -435,7 +435,7 @@ public final annotation class DslMarker : R|kotlin/Annotation| {
}
<E> public abstract class Enum : R|kotlin/Comparable<E>| {
public abstract class Enum<E> : R|kotlin/Comparable<E>| {
protected final fun clone(): R|kotlin/Any|
public final operator fun compareTo(other: R|E|): R|kotlin/Int|
@@ -589,7 +589,7 @@ public final class FloatArray : R|kotlin/Any| {
}
<R> public abstract interface Function : R|kotlin/Any| {
public abstract interface Function<R> : R|kotlin/Any| {
}
public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>| {