Skip to content

Commit 7aa10a6

Browse files
committed
upstream changes in visibility
1 parent d3527ab commit 7aa10a6

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassDeclarationDescriptorImpl.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ class KSClassDeclarationDescriptorImpl private constructor(val descriptor: Class
5353

5454
override fun getAllFunctions(): List<KSFunctionDeclaration> {
5555
return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS).toList()
56-
.filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
56+
.filter { (it as FunctionDescriptor).visibility.delegate != Visibilities.InvisibleFake}
5757
.map { KSFunctionDeclarationDescriptorImpl.getCached(it as FunctionDescriptor) }
5858
}
5959

6060
override fun getAllProperties(): List<KSPropertyDeclaration> {
6161
return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES).toList()
62-
.filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
62+
.filter { (it as PropertyDescriptor).visibility.delegate != Visibilities.InvisibleFake}
6363
.map { KSPropertyDeclarationDescriptorImpl.getCached(it as PropertyDescriptor) }
6464
}
6565

@@ -83,8 +83,8 @@ class KSClassDeclarationDescriptorImpl private constructor(val descriptor: Class
8383
listOf(descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(), descriptor.staticScope.getDescriptorsFiltered()).flatten()
8484
.filter {
8585
it is MemberDescriptor
86-
&& it.visibility != Visibilities.INHERITED
87-
&& it.visibility != Visibilities.INVISIBLE_FAKE
86+
&& it.visibility.delegate != Visibilities.Inherited
87+
&& it.visibility.delegate != Visibilities.InvisibleFake
8888
}
8989
.map {
9090
when (it) {

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
7777
return descriptor?.let {
7878
it.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS)
7979
.toList()
80-
.filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
80+
.filter { (it as FunctionDescriptor).visibility.delegate != Visibilities.InvisibleFake }
8181
.plus(it.constructors)
8282
.map { (it as FunctionDescriptor).toKSFunctionDeclaration() }
8383
} ?: emptyList()
@@ -87,7 +87,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
8787
return descriptor?.let {
8888
it.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES)
8989
.toList()
90-
.filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
90+
.filter { (it as PropertyDescriptor).visibility.delegate != Visibilities.InvisibleFake }
9191
.map{ (it as PropertyDescriptor).toKSPropertyDeclaration() }
9292
} ?: emptyList()
9393
}

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassDeclarationImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ class KSClassDeclarationImpl private constructor(val ktClassOrObject: KtClassOrO
5050

5151
override fun getAllFunctions(): List<KSFunctionDeclaration> {
5252
return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS).toList()
53-
.filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
53+
.filter { (it as FunctionDescriptor).visibility.delegate != Visibilities.InvisibleFake }
5454
.map { (it as FunctionDescriptor).toKSFunctionDeclaration() }
5555
}
5656

5757
override fun getAllProperties(): List<KSPropertyDeclaration> {
5858
return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES).toList()
59-
.filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
59+
.filter { (it as PropertyDescriptor).visibility.delegate != Visibilities.InvisibleFake }
6060
.map { (it as PropertyDescriptor).toKSPropertyDeclaration() }
6161
}
6262

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/utils.kt

+7-8
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ import com.google.devtools.ksp.symbol.impl.java.KSPropertyDeclarationJavaImpl
3333
import com.google.devtools.ksp.symbol.impl.java.KSTypeArgumentJavaImpl
3434
import com.google.devtools.ksp.symbol.impl.kotlin.*
3535
import com.intellij.psi.impl.source.PsiClassImpl
36+
import org.jetbrains.kotlin.descriptors.java.JavaVisibilities
3637
import org.jetbrains.kotlin.lexer.KtTokens
37-
import org.jetbrains.kotlin.load.java.JavaVisibilities
3838
import org.jetbrains.kotlin.load.java.descriptors.JavaClassConstructorDescriptor
3939
import org.jetbrains.kotlin.psi.*
40-
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
4140
import org.jetbrains.kotlin.resolve.source.getPsi
4241
import org.jetbrains.kotlin.types.KotlinType
4342
import org.jetbrains.kotlin.types.StarProjectionImpl
@@ -129,13 +128,13 @@ fun MemberDescriptor.toKSModifiers(): Set<Modifier> {
129128
Modality.OPEN -> modifiers.add(Modifier.OPEN)
130129
Modality.ABSTRACT -> modifiers.add(Modifier.ABSTRACT)
131130
}
132-
when (this.visibility) {
133-
Visibilities.PUBLIC -> modifiers.add(Modifier.PUBLIC)
134-
Visibilities.PROTECTED, JavaVisibilities.PROTECTED_AND_PACKAGE -> modifiers.add(Modifier.PROTECTED)
135-
Visibilities.PRIVATE -> modifiers.add(Modifier.PRIVATE)
136-
Visibilities.INTERNAL -> modifiers.add(Modifier.INTERNAL)
131+
when (this.visibility.delegate) {
132+
Visibilities.Public -> modifiers.add(Modifier.PUBLIC)
133+
Visibilities.Protected, JavaVisibilities.ProtectedAndPackage -> modifiers.add(Modifier.PROTECTED)
134+
Visibilities.Private -> modifiers.add(Modifier.PRIVATE)
135+
Visibilities.Internal -> modifiers.add(Modifier.INTERNAL)
137136
// Since there is no modifier for package-private, use No modifier to tell if a symbol from binary is package private.
138-
JavaVisibilities.PACKAGE_VISIBILITY, JavaVisibilities.PROTECTED_STATIC_VISIBILITY -> Unit
137+
JavaVisibilities.PackageVisibility, JavaVisibilities.ProtectedStaticVisibility -> Unit
139138
else -> throw IllegalStateException("unhandled visibility: ${this.visibility}")
140139
}
141140
return modifiers

0 commit comments

Comments
 (0)