Clean up unnecessary static variables.

google · Aug 16, 2022 · 05399d5 · 05399d5
1 parent 40ac652
commit 05399d5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/ResolverImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/ResolverImpl.kt
@@ -109,7 +109,6 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext
-import org.jetbrains.kotlin.types.expressions.DoubleColonExpressionResolver
 import org.jetbrains.kotlin.types.typeUtil.replaceArgumentsWithStarProjections
 import org.jetbrains.kotlin.types.typeUtil.substitute
 import org.jetbrains.kotlin.types.typeUtil.supertypes
@@ -158,27 +157,23 @@ class ResolverImpl(
     }
 
     companion object {
-        lateinit var resolveSession: ResolveSession
-        lateinit var bodyResolver: BodyResolver
-        lateinit var constantExpressionEvaluator: ConstantExpressionEvaluator
-        lateinit var declarationScopeProvider: DeclarationScopeProvider
-        lateinit var topDownAnalyzer: LazyTopDownAnalyzer
         lateinit var instance: ResolverImpl
-        lateinit var annotationResolver: AnnotationResolver
-        lateinit var moduleClassResolver: ModuleClassResolver
-        lateinit var javaTypeResolver: JavaTypeResolver
-        lateinit var lazyJavaResolverContext: LazyJavaResolverContext
-        lateinit var doubleColonExpressionResolver: DoubleColonExpressionResolver
     }
 
+    var resolveSession: ResolveSession
+    var bodyResolver: BodyResolver
+    var constantExpressionEvaluator: ConstantExpressionEvaluator
+    var declarationScopeProvider: DeclarationScopeProvider
+
+    lateinit var moduleClassResolver: ModuleClassResolver
+    lateinit var javaTypeResolver: JavaTypeResolver
+    lateinit var lazyJavaResolverContext: LazyJavaResolverContext
+
     init {
         resolveSession = componentProvider.get()
         bodyResolver = componentProvider.get()
         declarationScopeProvider = componentProvider.get()
-        topDownAnalyzer = componentProvider.get()
         constantExpressionEvaluator = componentProvider.get()
-        doubleColonExpressionResolver = componentProvider.get()
-        annotationResolver = resolveSession.annotationResolver
 
         componentProvider.tryGetService(JavaResolverComponents::class.java)?.let {
             lazyJavaResolverContext = LazyJavaResolverContext(it, TypeParameterResolver.EMPTY) { null }

diff --git a/.../src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt b/.../src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt
@@ -250,7 +250,7 @@ fun ValueParameterDescriptor.getDefaultValue(ownerAnnotation: KSAnnotation): Any
             }
             is JavaAnnotationAsAnnotationArgument -> {
                 AnnotationValue(
-                    LazyJavaAnnotationDescriptor(ResolverImpl.lazyJavaResolverContext, this.getAnnotation())
+                    LazyJavaAnnotationDescriptor(ResolverImpl.instance.lazyJavaResolverContext, this.getAnnotation())
                 )
             }
             is JavaClassObjectAnnotationArgument -> {

diff --git a/...in/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt b/...in/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt
@@ -74,7 +74,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) :
 
     // Could the resolution ever fail?
     private val descriptor: ClassDescriptor? by lazy {
-        ResolverImpl.moduleClassResolver.resolveClass(JavaClassImpl(psi))
+        ResolverImpl.instance.moduleClassResolver.resolveClass(JavaClassImpl(psi))
     }
 
     // TODO in 1.5 + jvmTarget 15, will we return Java permitted types?