fix error type replace logic after error type hint change

google · Jun 10, 2024 · 00862a1 · 00862a1
1 parent 8e5471f
commit 00862a1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/common-util/src/main/kotlin/com/google/devtools/ksp/common/ErrorTypeUtils.kt b/common-util/src/main/kotlin/com/google/devtools/ksp/common/ErrorTypeUtils.kt
@@ -3,6 +3,7 @@ package com.google.devtools.ksp.common
 import com.google.devtools.ksp.symbol.KSType
 import com.google.devtools.ksp.symbol.KSTypeArgument
 
+// This does not work when the type is already error AND args are either empty or matches actual size.
 inline fun <E> errorTypeOnInconsistentArguments(
     arguments: List<KSTypeArgument>,
     placeholdersProvider: () -> List<KSTypeArgument>,

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeImpl.kt
@@ -111,6 +111,10 @@ class KSTypeImpl private constructor(internal val type: KtType) : KSType {
     }
 
     override fun replace(arguments: List<KSTypeArgument>): KSType {
+        // Do not replace for already error types.
+        if (isError) {
+            return this
+        }
         errorTypeOnInconsistentArguments(
             arguments = arguments,
             placeholdersProvider = { type.typeArguments().map { KSTypeArgumentResolvedImpl.getCached(it) } },

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt
@@ -660,7 +660,7 @@ internal fun KtType.replace(newArgs: List<KtTypeProjection>): KtType {
             // No need to copy nullability for type parameters
             // because it is overridden to be always nullable in compiler.
             is KtTypeParameterSymbol -> analysisSession.buildTypeParameterType(symbol)
-            else -> throw IllegalStateException("Unexpected type $this")
+            else -> throw IllegalStateException("Unexpected type ${this@replace}")
         }
     }
 }

diff --git a/kotlin-analysis-api/testData/replaceWithErrorTypeArgs.kt b/kotlin-analysis-api/testData/replaceWithErrorTypeArgs.kt
@@ -103,6 +103,7 @@
 // flexible type replace argument:JS1<Int>
 // [COVARIANT P], [P]
 // [COVARIANT Int?], [Int?]
+// replace error type get: <ERROR TYPE: Err>
 // END
 
 // MODULE: lib
@@ -127,6 +128,8 @@ class Foo<P: Any?> {
     val barNullableFoo: Bar<out Int?> = TODO()
 }
 class Bar<T>
+
+class ErrorSuper : Err {}
 // FILE: JS.java
 class JS<T1, T2> {}
 class JS1<T> {

diff --git a/...ls/src/main/kotlin/com/google/devtools/ksp/processor/ReplaceWithErrorTypeArgsProcessor.kt b/...ls/src/main/kotlin/com/google/devtools/ksp/processor/ReplaceWithErrorTypeArgsProcessor.kt
@@ -77,6 +77,9 @@ open class ReplaceWithErrorTypeArgsProcessor : AbstractTestProcessor() {
                 )
             }
         }
+        resolver.getClassDeclarationByName("ErrorSuper")?.let {
+            results.add("replace error type get: ${it.superTypes.single().resolve().replace(emptyList())}")
+        }
         return emptyList()
     }