Skip to content

Fix: Map INTERSECTION_OVERRIDE to Synthetic #2665

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

Merged
ting-yuan merged 2 commits into from
Oct 24, 2025
Merged

Fix: Map INTERSECTION_OVERRIDE to Synthetic #2665

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
fd03dd5
Fix #2663
jonamireh Oct 22, 2025
201b802
Map INTERSECTION_OVERRIDE to Synthetic
jonamireh Oct 23, 2025
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
2 changes: 1 addition & 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 @@ -86,7 +86,7 @@ internal val ktSymbolOriginToOrigin = mapOf(
KaSymbolOrigin.DELEGATED to Origin.SYNTHETIC,
KaSymbolOrigin.PROPERTY_BACKING_FIELD to Origin.KOTLIN,
KaSymbolOrigin.JAVA_SYNTHETIC_PROPERTY to Origin.SYNTHETIC,
KaSymbolOrigin.INTERSECTION_OVERRIDE to Origin.KOTLIN,
KaSymbolOrigin.INTERSECTION_OVERRIDE to Origin.SYNTHETIC,
// TODO: distinguish between kotlin library and java library.
KaSymbolOrigin.LIBRARY to Origin.KOTLIN_LIB,
KaSymbolOrigin.SUBSTITUTION_OVERRIDE to Origin.JAVA_LIB
Expand Down
9 changes: 9 additions & 0 deletions kotlin-analysis-api/testData/visibilities.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
// KtEnumWithVal: values: PUBLIC
// KtEnumWithVal: valueOf: PUBLIC
// JavaAnnotation: value: PUBLIC
// IntersectionC: property: PUBLIC
// END

// MODULE: lib
Expand All @@ -68,6 +69,14 @@ open class KotlinClass {
enum class LibEnum(val value: Int) {
A(0), B(1), C(2);
}
// FILE: Intersection.kt
interface IntersectionA {
val property: String
}
interface IntersectionB {
val property: String
}
interface IntersectionC: IntersectionA, IntersectionB

// MODULE: main(lib)
// FILE: a.kt
Expand Down
4 changes: 4 additions & 0 deletions test-utils/src/main/kotlin/com/google/devtools/ksp/processor/VisibilityProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class VisibilityProcessor : AbstractTestProcessor() {
val kotlinEnum = resolver.getClassDeclarationByName("KtEnum")!!
val kotlinEnumWithVal = resolver.getClassDeclarationByName("KtEnumWithVal")!!
val javaAnnotation = resolver.getClassDeclarationByName("JavaAnnotation")!!
val intersectionClass = resolver.getClassDeclarationByName("IntersectionC")!!
javaClass.declarations.filterIsInstance<KSPropertyDeclaration>().map {
"${it.simpleName.asString()}: ${it.getVisibility()},visible in A, B, D: " +
"${it.isVisibleFrom(symbolA)}, ${it.isVisibleFrom(symbolB)}, ${it.isVisibleFrom(symbolD)}"
Expand Down Expand Up @@ -82,6 +83,9 @@ class VisibilityProcessor : AbstractTestProcessor() {
javaAnnotation.declarations.filterIsInstance<KSPropertyDeclaration>().map {
"${javaAnnotation.simpleName.asString()}: ${it.simpleName.asString()}: ${it.getVisibility() }"
}.forEach { results.add(it) }
intersectionClass.getAllProperties().map {
"${intersectionClass.simpleName.asString()}: ${it.simpleName.asString()}: ${it.getVisibility() }"
}.forEach { results.add(it) }
return emptyList()
}
}
Loading