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

FIR analysis API: add workaround for java.io.Serializable type

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-05-27 11:54:14 +02:00
committed by Space
parent ef5cfab655
commit f4510773d0
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/renderer/ConeTypeIdeRenderer.kt
+5 -7
View File
@@ -218,20 +218,18 @@ internal class ConeTypeIdeRenderer(
} }
val classSymbolToRender = type.lookupTag.toSymbol(session) val classSymbolToRender = type.lookupTag.toSymbol(session)
if (classSymbolToRender == null) { // To be able to render unresolved types like java.io.Serializable
appendError("Unresolved type") val classId = classSymbolToRender?.classId ?: type.lookupTag.classId
return
}
if (!options.shortQualifiedNames && !classSymbolToRender.classId.isLocal) { if (!options.shortQualifiedNames && !classId.isLocal) {
val packageName = classSymbolToRender.classId.packageFqName.asString() val packageName = classId.packageFqName.asString()
if (packageName.isNotEmpty()) { if (packageName.isNotEmpty()) {
append(packageName).append(".") append(packageName).append(".")
} }
} }
if (classSymbolToRender !is FirRegularClassSymbol) { if (classSymbolToRender !is FirRegularClassSymbol) {
append(classSymbolToRender.classId.shortClassName) append(classId.shortClassName)
if (type.typeArguments.any()) { if (type.typeArguments.any()) {
type.typeArguments.joinTo(this, ", ", prefix = "<", postfix = ">") { type.typeArguments.joinTo(this, ", ", prefix = "<", postfix = ">") {
renderTypeProjection(it) renderTypeProjection(it)
analysis/analysis-api/testData/referenceResolve/typeParameter/TypeParameterInFunctionLiteral.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
Resolved to: Resolved to:
0: (in kotlin) class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence, ERROR_TYPE <Unresolved type> 0: (in kotlin) class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable
analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedClass.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
Resolved to: Resolved to:
0: (in kotlin) class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence, ERROR_TYPE <Unresolved type> 0: (in kotlin) class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable
analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentUnresolvedConstructor.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
Resolved to: Resolved to:
0: (in kotlin) class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence, ERROR_TYPE <Unresolved type> 0: (in kotlin) class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable
analysis/analysis-api/testData/referenceResolve/withErrors/TypeArgumentWrongNumber.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
Resolved to: Resolved to:
0: (in kotlin) class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence, ERROR_TYPE <Unresolved type> 0: (in kotlin) class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable