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

FE10 analysis API: fix flexible type pretty-printing

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-05-25 12:40:25 +02:00
committed by Space
parent fa0faa33a5
commit 564d179cfb
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeRenderer.kt
+3 -2
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.bas
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.getKtNamedAnnotationArguments import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.getKtNamedAnnotationArguments
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.maybeLocalClassId import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.maybeLocalClassId
import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter
import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint
import org.jetbrains.kotlin.builtins.* import org.jetbrains.kotlin.builtins.*
import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor
import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters
@@ -136,8 +137,8 @@ internal class KtFe10TypeRenderer(private val options: KtTypeRendererOptions, pr
return return
} }
val lowerBoundText = buildString { renderType(type.lowerBound) } val lowerBoundText = prettyPrint { renderType(type.lowerBound) }
val upperBoundText = buildString { renderType(type.upperBound) } val upperBoundText = prettyPrint { renderType(type.upperBound) }
append(DescriptorRenderer.COMPACT.renderFlexibleType(lowerBoundText, upperBoundText, type.builtIns)) append(DescriptorRenderer.COMPACT.renderFlexibleType(lowerBoundText, upperBoundText, type.builtIns))
} }
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.pretty.txt
Vendored
+10 -10
View File
@@ -1,4 +1,4 @@
override operator fun iterator(): kotlin.collections.MutableIterator<EE?!> override operator fun iterator(): kotlin.collections.MutableIterator<E!>
open operator fun equals(other: kotlin.Any?): kotlin.Boolean open operator fun equals(other: kotlin.Any?): kotlin.Boolean
@@ -10,22 +10,22 @@ fun size(): kotlin.Int
fun isEmpty(): kotlin.Boolean fun isEmpty(): kotlin.Boolean
operator fun contains(p0: kotlin.Anykotlin.Any?!): kotlin.Boolean operator fun contains(p0: kotlin.Any!): kotlin.Boolean
fun toArray(): kotlin.Array<kotlin.Anykotlin.Any?!>kotlin.Array<out kotlin.Anykotlin.Any?!>?! fun toArray(): kotlin.Array<(out) kotlin.Any!>!
fun <T : kotlin.Anykotlin.Any?!> toArray(p0: kotlin.Array<TT?!>kotlin.Array<out TT?!>?!): kotlin.Array<TT?!>kotlin.Array<out TT?!>?! fun <T : kotlin.Any!> toArray(p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
fun add(p0: EE?!): kotlin.Boolean fun add(p0: E!): kotlin.Boolean
fun remove(p0: kotlin.Anykotlin.Any?!): kotlin.Boolean fun remove(p0: kotlin.Any!): kotlin.Boolean
fun containsAll(p0: kotlin.collections.MutableCollection<*>kotlin.collections.Collection<*>?!): kotlin.Boolean fun containsAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
fun addAll(p0: kotlin.collections.MutableCollection<out EE?!>kotlin.collections.Collection<EE?!>?!): kotlin.Boolean fun addAll(p0: (kotlin.collections.MutableCollection<out E!>..kotlin.collections.Collection<E!>?)): kotlin.Boolean
fun removeAll(p0: kotlin.collections.MutableCollection<*>kotlin.collections.Collection<*>?!): kotlin.Boolean fun removeAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
fun retainAll(p0: kotlin.collections.MutableCollection<*>kotlin.collections.Collection<*>?!): kotlin.Boolean fun retainAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
fun clear() fun clear()
analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.pretty.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
class String : java.io.Serializable, kotlin.Comparable<kotlin.Stringkotlin.String?!>, kotlin.CharSequence class String : java.io.Serializable, kotlin.Comparable<kotlin.String!>, kotlin.CharSequence
analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.pretty.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
constructor(c: kotlin.collections.MutableCollection<out EE?!>kotlin.collections.Collection<EE?!>?!) constructor(c: (kotlin.collections.MutableCollection<out E!>..kotlin.collections.Collection<E!>?))