From 7395a14df75116143c7107b0aef56e57de216989 Mon Sep 17 00:00:00 2001 From: Jiaxiang Chen Date: Tue, 21 Nov 2023 11:56:24 -0800 Subject: [PATCH] use non thread safe object cache for KSP1 --- .../ksp/KotlinSymbolProcessingExtension.kt | 1 + .../processing/impl/KSObjectCacheManager.kt | 37 +++++++++++++++++++ .../ksp/symbol/impl/DescriptorUtils.kt | 2 +- .../impl/binary/KSAnnotationDescriptorImpl.kt | 2 +- .../KSClassDeclarationDescriptorImpl.kt | 1 + .../KSClassifierReferenceDescriptorImpl.kt | 2 +- .../KSFunctionDeclarationDescriptorImpl.kt | 2 +- .../KSPropertyDeclarationDescriptorImpl.kt | 3 +- .../binary/KSPropertyGetterDescriptorImpl.kt | 2 +- .../binary/KSPropertySetterDescriptorImpl.kt | 2 +- .../impl/binary/KSTypeAliasDescriptorImpl.kt | 2 +- .../binary/KSTypeArgumentDescriptorImpl.kt | 2 +- .../binary/KSTypeParameterDescriptorImpl.kt | 2 +- .../binary/KSTypeReferenceDescriptorImpl.kt | 2 +- .../binary/KSValueParameterDescriptorImpl.kt | 2 +- .../symbol/impl/java/KSAnnotationJavaImpl.kt | 2 +- .../KSClassDeclarationJavaEnumEntryImpl.kt | 2 +- .../impl/java/KSClassDeclarationJavaImpl.kt | 2 +- .../java/KSClassifierReferenceJavaImpl.kt | 2 +- .../KSClassifierReferenceLiteImplForJava.kt | 2 +- .../ksp/symbol/impl/java/KSFileJavaImpl.kt | 2 +- .../java/KSFunctionDeclarationJavaImpl.kt | 2 +- .../java/KSPropertyDeclarationJavaImpl.kt | 2 +- .../impl/java/KSTypeArgumentJavaImpl.kt | 2 +- .../impl/java/KSTypeParameterJavaImpl.kt | 2 +- .../impl/java/KSTypeReferenceJavaImpl.kt | 2 +- .../impl/java/KSTypeReferenceLiteJavaImpl.kt | 2 +- .../impl/java/KSValueArgumentJavaImpl.kt | 2 +- .../impl/java/KSValueParameterJavaImpl.kt | 2 +- .../symbol/impl/kotlin/KSAnnotationImpl.kt | 2 +- .../impl/kotlin/KSCallableReferenceImpl.kt | 2 +- .../impl/kotlin/KSClassDeclarationImpl.kt | 2 +- .../impl/kotlin/KSClassifierReferenceImpl.kt | 2 +- .../impl/kotlin/KSDefNonNullReferenceImpl.kt | 2 +- .../impl/kotlin/KSDynamicReferenceImpl.kt | 2 +- .../ksp/symbol/impl/kotlin/KSFileImpl.kt | 2 +- .../impl/kotlin/KSFunctionDeclarationImpl.kt | 2 +- .../impl/kotlin/KSPropertyDeclarationImpl.kt | 2 +- .../KSPropertyDeclarationParameterImpl.kt | 2 +- .../impl/kotlin/KSPropertyGetterImpl.kt | 2 +- .../impl/kotlin/KSPropertySetterImpl.kt | 2 +- .../ksp/symbol/impl/kotlin/KSTypeAliasImpl.kt | 2 +- .../symbol/impl/kotlin/KSTypeArgumentImpl.kt | 2 +- .../impl/kotlin/KSTypeArgumentLiteImpl.kt | 2 +- .../ksp/symbol/impl/kotlin/KSTypeImpl.kt | 2 +- .../symbol/impl/kotlin/KSTypeParameterImpl.kt | 2 +- .../kotlin/KSTypeReferenceDeferredImpl.kt | 2 +- .../symbol/impl/kotlin/KSTypeReferenceImpl.kt | 2 +- .../symbol/impl/kotlin/KSValueArgumentImpl.kt | 2 +- .../impl/kotlin/KSValueParameterImpl.kt | 2 +- .../synthetic/KSConstructorSyntheticImpl.kt | 2 +- .../KSPropertyGetterSyntheticImpl.kt | 2 +- .../KSPropertySetterSyntheticImpl.kt | 2 +- .../KSValueParameterSyntheticImpl.kt | 2 +- 54 files changed, 90 insertions(+), 52 deletions(-) create mode 100644 compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/KSObjectCacheManager.kt diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt index 99bf72d067..ac57f58230 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt @@ -25,6 +25,7 @@ import com.google.devtools.ksp.processing.SymbolProcessorProvider import com.google.devtools.ksp.processing.impl.CodeGeneratorImpl import com.google.devtools.ksp.processing.impl.JsPlatformInfoImpl import com.google.devtools.ksp.processing.impl.JvmPlatformInfoImpl +import com.google.devtools.ksp.processing.impl.KSObjectCacheManager import com.google.devtools.ksp.processing.impl.KSPCompilationError import com.google.devtools.ksp.processing.impl.MessageCollectorBasedKSPLogger import com.google.devtools.ksp.processing.impl.NativePlatformInfoImpl diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/KSObjectCacheManager.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/KSObjectCacheManager.kt new file mode 100644 index 0000000000..1abc9e6263 --- /dev/null +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/KSObjectCacheManager.kt @@ -0,0 +1,37 @@ +/* + * Copyright 2020 Google LLC + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.devtools.ksp.processing.impl + +class KSObjectCacheManager { + companion object { + val caches = arrayListOf>() + + fun register(cache: KSObjectCache<*, *>) = caches.add(cache) + fun clear() = caches.forEach { it.clear() } + } +} + +abstract class KSObjectCache { + val cache = mutableMapOf() + + init { + KSObjectCacheManager.register(this) + } + + open fun clear() = cache.clear() +} diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/DescriptorUtils.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/DescriptorUtils.kt index 77165f8061..03c7211ae7 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/DescriptorUtils.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/DescriptorUtils.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.getClassDeclarationByName import com.google.devtools.ksp.processing.Resolver +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSAnnotated import com.google.devtools.ksp.symbol.KSType import com.google.devtools.ksp.symbol.Modifier diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt index dc682c2557..39a47a9728 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSAnnotationDescriptorImpl.kt @@ -18,9 +18,9 @@ package com.google.devtools.ksp.symbol.impl.binary import com.google.devtools.ksp.ExceptionMessage -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.getClassDeclarationByName import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.KSTypeReferenceSyntheticImpl import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassDeclarationDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassDeclarationDescriptorImpl.kt index 94f788fb0a..2a112737d5 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassDeclarationDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassDeclarationDescriptorImpl.kt @@ -18,6 +18,7 @@ package com.google.devtools.ksp.symbol.impl.binary import com.google.devtools.ksp.* +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassifierReferenceDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassifierReferenceDescriptorImpl.kt index 96e086ee1c..4d83abb41d 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassifierReferenceDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassifierReferenceDescriptorImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.binary -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSFunctionDeclarationDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSFunctionDeclarationDescriptorImpl.kt index e9fe9c764e..b95f13967f 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSFunctionDeclarationDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSFunctionDeclarationDescriptorImpl.kt @@ -18,7 +18,7 @@ package com.google.devtools.ksp.symbol.impl.binary import com.google.devtools.ksp.ExceptionMessage -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertyDeclarationDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertyDeclarationDescriptorImpl.kt index 6107fc90cd..67fafa9c81 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertyDeclarationDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertyDeclarationDescriptorImpl.kt @@ -17,12 +17,11 @@ package com.google.devtools.ksp.symbol.impl.binary -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.* -import com.google.devtools.ksp.toKSModifiers import org.jetbrains.kotlin.descriptors.* import org.jetbrains.org.objectweb.asm.Opcodes diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertyGetterDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertyGetterDescriptorImpl.kt index 078ccfc70e..5af00105cf 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertyGetterDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertyGetterDescriptorImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.binary -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertySetterDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertySetterDescriptorImpl.kt index 04b71ccca6..a06de621a9 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertySetterDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSPropertySetterDescriptorImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.binary -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import org.jetbrains.kotlin.descriptors.PropertySetterDescriptor diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeAliasDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeAliasDescriptorImpl.kt index fe1ab3493d..0720fd0c69 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeAliasDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeAliasDescriptorImpl.kt @@ -1,7 +1,7 @@ package com.google.devtools.ksp.symbol.impl.binary -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.toKSModifiers import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeArgumentDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeArgumentDescriptorImpl.kt index 5b76e27af2..2bae4d03bb 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeArgumentDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeArgumentDescriptorImpl.kt @@ -18,7 +18,7 @@ package com.google.devtools.ksp.symbol.impl.binary import com.google.devtools.ksp.IdKeyTriple -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSNode import com.google.devtools.ksp.symbol.KSTypeReference diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeParameterDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeParameterDescriptorImpl.kt index 7dc8241b54..fe617076a7 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeParameterDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeParameterDescriptorImpl.kt @@ -18,8 +18,8 @@ package com.google.devtools.ksp.symbol.impl.binary import com.google.devtools.ksp.ExceptionMessage -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.kotlin.KSExpectActualNoImpl import com.google.devtools.ksp.symbol.impl.toKSVariance diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeReferenceDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeReferenceDescriptorImpl.kt index 91f68fa406..085df730a8 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeReferenceDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSTypeReferenceDescriptorImpl.kt @@ -18,8 +18,8 @@ package com.google.devtools.ksp.symbol.impl.binary import com.google.devtools.ksp.IdKeyTriple -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSNode import com.google.devtools.ksp.symbol.KSReferenceElement diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSValueParameterDescriptorImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSValueParameterDescriptorImpl.kt index 29f53a4591..b4c5674117 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSValueParameterDescriptorImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSValueParameterDescriptorImpl.kt @@ -17,8 +17,8 @@ package com.google.devtools.ksp.symbol.impl.binary -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.resolve.calls.components.hasDefaultValue diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSAnnotationJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSAnnotationJavaImpl.kt index c051bb74ac..8fd78437f2 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSAnnotationJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSAnnotationJavaImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.getClassDeclarationByName import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.binary.getAbsentDefaultArguments diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaEnumEntryImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaEnumEntryImpl.kt index 05f017be10..cf20690f69 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaEnumEntryImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaEnumEntryImpl.kt @@ -17,8 +17,8 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt index bc6c01c6af..c409979373 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt @@ -17,10 +17,10 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.isConstructor import com.google.devtools.ksp.memoized import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassifierReferenceJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassifierReferenceJavaImpl.kt index 748a0b93e2..2d12de64c1 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassifierReferenceJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassifierReferenceJavaImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.getInstanceForCurrentRound import com.google.devtools.ksp.symbol.impl.toLocation diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassifierReferenceLiteImplForJava.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassifierReferenceLiteImplForJava.kt index 3d2a0624ac..b69f062aad 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassifierReferenceLiteImplForJava.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassifierReferenceLiteImplForJava.kt @@ -1,7 +1,7 @@ package com.google.devtools.ksp.symbol.impl.java import com.google.devtools.ksp.ExceptionMessage -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSClassifierReference import com.google.devtools.ksp.symbol.KSTypeArgument import com.google.devtools.ksp.symbol.Location diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSFileJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSFileJavaImpl.kt index e49eea06ba..2b90b207a6 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSFileJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSFileJavaImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.toLocation import com.intellij.psi.PsiJavaFile diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSFunctionDeclarationJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSFunctionDeclarationJavaImpl.kt index a1d60e1cb4..4249f2ca2b 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSFunctionDeclarationJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSFunctionDeclarationJavaImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSPropertyDeclarationJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSPropertyDeclarationJavaImpl.kt index 57ff59416e..318fdd84f8 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSPropertyDeclarationJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSPropertyDeclarationJavaImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeArgumentJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeArgumentJavaImpl.kt index 211cf4c802..35d866d2d7 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeArgumentJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeArgumentJavaImpl.kt @@ -17,8 +17,8 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.kotlin.KSTypeArgumentImpl import com.google.devtools.ksp.symbol.impl.toLocation diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeParameterJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeParameterJavaImpl.kt index e3c41286bd..b606cd320b 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeParameterJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeParameterJavaImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.findParentDeclaration import com.google.devtools.ksp.symbol.impl.kotlin.KSExpectActualNoImpl diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeReferenceJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeReferenceJavaImpl.kt index f9a2e75b4d..f69adb9d64 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeReferenceJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeReferenceJavaImpl.kt @@ -18,8 +18,8 @@ package com.google.devtools.ksp.symbol.impl.java import com.google.devtools.ksp.ExceptionMessage -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.KSAnnotated import com.google.devtools.ksp.symbol.KSAnnotation diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeReferenceLiteJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeReferenceLiteJavaImpl.kt index 601c8bee53..a62747a618 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeReferenceLiteJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSTypeReferenceLiteJavaImpl.kt @@ -18,7 +18,7 @@ package com.google.devtools.ksp.symbol.impl.java import com.google.devtools.ksp.ExceptionMessage -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSNode diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSValueArgumentJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSValueArgumentJavaImpl.kt index 1424b9e48b..ebf8db5dba 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSValueArgumentJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSValueArgumentJavaImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.java -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSName import com.google.devtools.ksp.symbol.KSNode diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSValueParameterJavaImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSValueParameterJavaImpl.kt index aae93eb943..34a8e008f1 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSValueParameterJavaImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSValueParameterJavaImpl.kt @@ -18,8 +18,8 @@ package com.google.devtools.ksp.symbol.impl.java import com.google.devtools.ksp.IdKeyPair -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.getInstanceForCurrentRound import com.google.devtools.ksp.symbol.impl.toLocation diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSAnnotationImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSAnnotationImpl.kt index 19bde1574e..ff2e7dab3a 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSAnnotationImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSAnnotationImpl.kt @@ -17,8 +17,8 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.binary.createKSValueArguments diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSCallableReferenceImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSCallableReferenceImpl.kt index c71f37d49e..92309dc326 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSCallableReferenceImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSCallableReferenceImpl.kt @@ -17,8 +17,8 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.findParentOfType +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.toLocation import org.jetbrains.kotlin.psi.KtFunctionType diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassDeclarationImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassDeclarationImpl.kt index 16f669334a..89c13666fc 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassDeclarationImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassDeclarationImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.isConstructor import com.google.devtools.ksp.memoized +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.KSTypeReferenceSyntheticImpl import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassifierReferenceImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassifierReferenceImpl.kt index 575c15d5d7..9ace2fc383 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassifierReferenceImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassifierReferenceImpl.kt @@ -17,8 +17,8 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.findParentOfType +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSClassifierReference import com.google.devtools.ksp.symbol.KSNode import com.google.devtools.ksp.symbol.KSTypeArgument diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSDefNonNullReferenceImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSDefNonNullReferenceImpl.kt index 37d07c9253..1845937a96 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSDefNonNullReferenceImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSDefNonNullReferenceImpl.kt @@ -1,7 +1,7 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.findParentOfType +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.toLocation import org.jetbrains.kotlin.psi.KtIntersectionType diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSDynamicReferenceImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSDynamicReferenceImpl.kt index 27579fce52..8e9fc33c9a 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSDynamicReferenceImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSDynamicReferenceImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* class KSDynamicReferenceImpl private constructor(override val parent: KSNode?) : KSDynamicReference { diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSFileImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSFileImpl.kt index 3e333a2e78..713d1024fc 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSFileImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSFileImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.getKSDeclarations import com.google.devtools.ksp.symbol.impl.toLocation diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSFunctionDeclarationImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSFunctionDeclarationImpl.kt index 75017fbb33..cb3ad2e8c0 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSFunctionDeclarationImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSFunctionDeclarationImpl.kt @@ -18,9 +18,9 @@ package com.google.devtools.ksp.symbol.impl.kotlin import com.google.devtools.ksp.ExceptionMessage -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.KSPCompilationError import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyDeclarationImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyDeclarationImpl.kt index 312b73d137..2aa8ff1b43 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyDeclarationImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyDeclarationImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyDeclarationParameterImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyDeclarationParameterImpl.kt index 1e69d24363..165419275a 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyDeclarationParameterImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyDeclarationParameterImpl.kt @@ -17,8 +17,8 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.isPrivate +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyGetterImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyGetterImpl.kt index bf328c29f1..5bba2c8091 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyGetterImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertyGetterImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.binary.KSTypeReferenceDescriptorImpl diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertySetterImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertySetterImpl.kt index 177567b049..87a693b77b 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertySetterImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSPropertySetterImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.synthetic.KSValueParameterSyntheticImpl diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeAliasImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeAliasImpl.kt index 7ccbcec691..8d75912534 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeAliasImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeAliasImpl.kt @@ -17,8 +17,8 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.* import org.jetbrains.kotlin.psi.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeArgumentImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeArgumentImpl.kt index d3cb397582..e9af1b5635 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeArgumentImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeArgumentImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.findParentOfType import com.google.devtools.ksp.memoized +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSNode import com.google.devtools.ksp.symbol.KSTypeArgument diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeArgumentLiteImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeArgumentLiteImpl.kt index d080fd87e4..1959c2dda8 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeArgumentLiteImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeArgumentLiteImpl.kt @@ -17,8 +17,8 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.findParentOfType +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSNode import com.google.devtools.ksp.symbol.KSTypeReference diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeImpl.kt index e6ca7235e9..20ed2c7fa2 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeImpl.kt @@ -18,7 +18,7 @@ package com.google.devtools.ksp.symbol.impl.kotlin import com.google.devtools.ksp.IdKey -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSDeclaration diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeParameterImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeParameterImpl.kt index 4e63b673de..14866922d5 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeParameterImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeParameterImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.KSTypeReferenceSyntheticImpl import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.KSExpectActual diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeReferenceDeferredImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeReferenceDeferredImpl.kt index 16a7437435..9114b42b8c 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeReferenceDeferredImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeReferenceDeferredImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSDeclaration import com.google.devtools.ksp.symbol.KSNode diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeReferenceImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeReferenceImpl.kt index 43ecd5274f..fc1762fa34 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeReferenceImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSTypeReferenceImpl.kt @@ -18,8 +18,8 @@ package com.google.devtools.ksp.symbol.impl.kotlin import com.google.devtools.ksp.ExceptionMessage -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSNode diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSValueArgumentImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSValueArgumentImpl.kt index aac1f41625..e1d4e278ec 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSValueArgumentImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSValueArgumentImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.symbol.KSAnnotation import com.google.devtools.ksp.symbol.KSName import com.google.devtools.ksp.symbol.KSNode diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSValueParameterImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSValueParameterImpl.kt index 6ce3995df9..325ab8d039 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSValueParameterImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSValueParameterImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.kotlin -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.memoized import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.KSTypeReferenceSyntheticImpl import com.google.devtools.ksp.processing.impl.findAnnotationFromUseSiteTarget import com.google.devtools.ksp.symbol.KSAnnotation diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSConstructorSyntheticImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSConstructorSyntheticImpl.kt index 8f2efd36f7..a7b2fd9164 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSConstructorSyntheticImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSConstructorSyntheticImpl.kt @@ -17,9 +17,9 @@ package com.google.devtools.ksp.symbol.impl.synthetic -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.isPublic import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.KSTypeReferenceSyntheticImpl import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSPropertyGetterSyntheticImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSPropertyGetterSyntheticImpl.kt index 104eca58b7..0fe9403f75 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSPropertyGetterSyntheticImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSPropertyGetterSyntheticImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.synthetic -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.binary.KSTypeReferenceDescriptorImpl diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSPropertySetterSyntheticImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSPropertySetterSyntheticImpl.kt index 8b27bc2f53..61c697116e 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSPropertySetterSyntheticImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSPropertySetterSyntheticImpl.kt @@ -17,7 +17,7 @@ package com.google.devtools.ksp.symbol.impl.synthetic -import com.google.devtools.ksp.KSObjectCache +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.ResolverImpl import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.symbol.impl.binary.KSValueParameterDescriptorImpl diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSValueParameterSyntheticImpl.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSValueParameterSyntheticImpl.kt index 6e5692b2f1..0d1c9d3d4e 100644 --- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSValueParameterSyntheticImpl.kt +++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/synthetic/KSValueParameterSyntheticImpl.kt @@ -1,8 +1,8 @@ package com.google.devtools.ksp.symbol.impl.synthetic import com.google.devtools.ksp.ExceptionMessage -import com.google.devtools.ksp.KSObjectCache import com.google.devtools.ksp.processing.impl.KSNameImpl +import com.google.devtools.ksp.processing.impl.KSObjectCache import com.google.devtools.ksp.processing.impl.findAnnotationFromUseSiteTarget import com.google.devtools.ksp.symbol.KSAnnotated import com.google.devtools.ksp.symbol.KSAnnotation