Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

asMemberOf: substitude upper and lower bounds recursively #2132

Merged
merged 2 commits into from
Oct 5, 2024
+103 −1
Merged

asMemberOf: substitude upper and lower bounds recursively #2132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
affd1c5
Test asMemberOf
kuanyingchou Sep 24, 2024
eba6147
asMemberOf: substitude upper and lower bounds recursively
ting-yuan Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,11 @@ internal fun KaValueParameterSymbol.getDefaultValue(): KaAnnotationValue? {
internal fun fillInDeepSubstitutor(context: KaType, substitutorBuilder: KaSubstitutorBuilder) {
val unwrappedType = when (context) {
is KaClassType -> context
is KaFlexibleType -> context.lowerBound as? KaClassType ?: return
is KaFlexibleType -> {
fillInDeepSubstitutor(context.upperBound, substitutorBuilder)
fillInDeepSubstitutor(context.lowerBound, substitutorBuilder)
return
}
else -> return
}
val parameters = unwrappedType.symbol.typeParameters
Expand Down
40 changes: 40 additions & 0 deletions kotlin-analysis-api/testData/asMemberOf.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@
// WITH_RUNTIME
// TEST PROCESSOR: AsMemberOfProcessor
// EXPECTED:
// main.Test: MutableIterator<(String..String?)>
// main.Test: Iterator<(String..String?)>
// main.Test: MutableIterator<(String..String?)>
// lib.Test: MutableIterator<(String..String?)>
// lib.Test: Iterator<(String..String?)>
// lib.Test: MutableIterator<(String..String?)>
// main.TestKt: MutableIterator<String>
// main.TestKt: Iterator<String>
// main.TestKt: MutableIterator<String>
// lib.TestKt: MutableIterator<String>
// lib.TestKt: Iterator<String>
// lib.TestKt: MutableIterator<String>
// Child1!!
// intType: kotlin.Int!!
// baseTypeArg1: kotlin.Int!!
Expand Down Expand Up @@ -111,6 +123,21 @@
// (kotlin.Int!!) -> kotlin.Unit!!
// Baz!!<kotlin.Long!!, kotlin.Number!!>
// END
// MODULE: lib
// FILE: Test.java
package lib;
import java.util.List;
class Test {
List<String> f() {
throw new RuntimeException("stub");
}
}
// FILE: TestKt.kt
package lib
class TestKt {
fun f(): MutableList<String> = TODO()
}
// MODULE: main(lib)
// FILE: Input.kt
open class Base<BaseTypeArg1, BaseTypeArg2> {
val intType: Int = 0
Expand Down Expand Up @@ -196,3 +223,16 @@ class JavaImpl implements KotlinInterface {
public void setY(int value) {
}
}
// FILE: main/Test.java
package main;
import java.util.List;
class Test {
List<String> f() {
throw new RuntimeException("stub");
}
}
// FILE: TestKt.kt
package main
class TestKt {
fun f(): MutableList<String> = TODO()
}
17 changes: 17 additions & 0 deletions test-utils/src/main/kotlin/com/google/devtools/ksp/processor/AsMemberOfProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,23 @@ class AsMemberOfProcessor : AbstractTestProcessor() {
}

override fun process(resolver: Resolver): List<KSAnnotated> {

listOf("main.Test", "lib.Test", "main.TestKt", "lib.TestKt").forEach { clsName ->
resolver.getClassDeclarationByName(clsName)!!.let { cls ->
val listType = cls.getAllFunctions().single { it.simpleName.asString() == "f" }.returnType!!.resolve()
val listDecl = listType.declaration as KSClassDeclaration
val iterator = listDecl.getAllFunctions().single { it.simpleName.asString() == "iterator" }
results.add("$clsName: ${iterator.asMemberOf(listType).returnType}")
val listIterator = resolver.getClassDeclarationByName("kotlin.collections.List")!!
.getDeclaredFunctions().single { it.simpleName.asString() == "iterator" }
results.add("$clsName: ${listIterator.asMemberOf(listType).returnType}")
val mutableListIterator =
resolver.getClassDeclarationByName("kotlin.collections.MutableCollection")!!
.getDeclaredFunctions().single { it.simpleName.asString() == "iterator" }
results.add("$clsName: ${mutableListIterator.asMemberOf(listType).returnType}")
}
}

val base = resolver.getClassDeclarationByName("Base")!!
val child1 = resolver.getClassDeclarationByName("Child1")!!
addToResults(resolver, base, child1.asStarProjectedType())
Expand Down
41 changes: 41 additions & 0 deletions test-utils/testData/api/asMemberOf.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@
// WITH_RUNTIME
// TEST PROCESSOR: AsMemberOfProcessor
// EXPECTED:
// main.Test: MutableIterator<(String..String?)>
// main.Test: Iterator<(String..String?)>
// main.Test: MutableIterator<(String..String?)>
// lib.Test: MutableIterator<(String..String?)>
// lib.Test: Iterator<(String..String?)>
// lib.Test: MutableIterator<(String..String?)>
// main.TestKt: MutableIterator<String>
// main.TestKt: Iterator<String>
// main.TestKt: MutableIterator<String>
// lib.TestKt: MutableIterator<String>
// lib.TestKt: Iterator<String>
// lib.TestKt: MutableIterator<String>
// Child1!!
// intType: kotlin.Int!!
// baseTypeArg1: kotlin.Int!!
Expand Down Expand Up @@ -112,6 +124,21 @@
// (kotlin.Int!!) -> kotlin.Unit!!
// Baz!!<kotlin.Long!!, kotlin.Number!!>
// END
// MODULE: lib
// FILE: Test.java
package lib;
import java.util.List;
class Test {
List<String> f() {
throw new RuntimeException("stub");
}
}
// FILE: TestKt.kt
package lib
class TestKt {
fun f(): MutableList<String> = TODO()
}
// MODULE: main(lib)
// FILE: Input.kt
open class Base<BaseTypeArg1, BaseTypeArg2> {
val intType: Int = 0
Expand Down Expand Up @@ -197,3 +224,17 @@ class JavaImpl implements KotlinInterface {
public void setY(int value) {
}
}

// FILE: main/Test.java
package main;
import java.util.List;
class Test {
List<String> f() {
throw new RuntimeException("stub");
}
}
// FILE: TestKt.kt
package main
class TestKt {
fun f(): MutableList<String> = TODO()
}
Loading