Google Git
Sign in
pigweed/third_party/github/google/ksp/refs/heads/upstream/2.3.7-release^!/.
commit
94f210494fd59326857aeed4723947a042a7dd70
[log]
author
Jakob Villumsen <villumsen@google.com>
Tue Apr 21 13:49:00 2026 +0200
committer
KSP Auto Pick <kotlin-symbol-processing@google.com>
Wed Apr 22 14:27:09 2026 +0000
tree
fd110ed3215e5ae130937dbed5d36cc3ce4fc294
parent
98fb4c77c9a5076f231f4ab584cc91707f5cbd22 [diff]
Move AnnotationResolutionStrategy-related files to common dir

These files belong in the common directory since they are not directly tied to an implementation of an interface in the KSP API. There will probably also be more files added later which will only pollute the `impl` directory further with classes irrelevant to implementing the API.

(cherry picked from commit 2612724aa6e97257899e7f1a2370c9acc2347df5)

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/AAResolutionStrategy.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/impl/AAResolutionStrategy.kt
similarity index 98%
rename from kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/AAResolutionStrategy.kt
rename to kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/impl/AAResolutionStrategy.kt
index 85d6cec..54d0340 100644
--- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/AAResolutionStrategy.kt
+++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/impl/AAResolutionStrategy.kt

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.google.devtools.ksp.impl
+package com.google.devtools.ksp.common.impl
 
 import com.google.devtools.ksp.common.visitor.CollectAnnotatedSymbolsVisitor
 import com.google.devtools.ksp.impl.symbol.kotlin.KSTypeImpl

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/AnnotationResolutionStrategy.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/impl/AnnotationResolutionStrategy.kt
similarity index 97%
rename from kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/AnnotationResolutionStrategy.kt
rename to kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/impl/AnnotationResolutionStrategy.kt
index e4e442f..aaebd4b 100644
--- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/AnnotationResolutionStrategy.kt
+++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/impl/AnnotationResolutionStrategy.kt

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.google.devtools.ksp.impl
+package com.google.devtools.ksp.common.impl
 
 import com.google.devtools.ksp.impl.symbol.kotlin.Restorable
 import com.google.devtools.ksp.processing.SymbolProcessor

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/PsiResolutionStrategy.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/impl/PsiResolutionStrategy.kt
similarity index 99%
rename from kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/PsiResolutionStrategy.kt
rename to kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/impl/PsiResolutionStrategy.kt
index 67b01df..9db0ac5 100644
--- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/PsiResolutionStrategy.kt
+++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/impl/PsiResolutionStrategy.kt

@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package com.google.devtools.ksp.impl
+package com.google.devtools.ksp.common.impl
 
 import com.google.devtools.ksp.common.mergeMapNotNullKeys
+import com.google.devtools.ksp.common.visitor.CollectAnnotatedSymbolsPsiVisitor
 import com.google.devtools.ksp.containingFile
 import com.google.devtools.ksp.impl.symbol.kotlin.KSClassDeclarationImpl
 import com.google.devtools.ksp.impl.symbol.kotlin.KSFileImpl
@@ -37,7 +38,6 @@
 import com.google.devtools.ksp.impl.symbol.kotlin.toKSFunctionDeclaration
 import com.google.devtools.ksp.impl.symbol.kotlin.toKSPropertyDeclaration
 import com.google.devtools.ksp.impl.symbol.kotlin.toLocation
-import com.google.devtools.ksp.impl.visitor.CollectAnnotatedSymbolsPsiVisitor
 import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.symbol.AnnotationUseSiteTarget
 import com.google.devtools.ksp.symbol.KSAnnotated

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/visitor/CollectAnnotatedSymbolsPsiVisitor.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/visitor/CollectAnnotatedSymbolsPsiVisitor.kt
similarity index 99%
rename from kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/visitor/CollectAnnotatedSymbolsPsiVisitor.kt
rename to kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/visitor/CollectAnnotatedSymbolsPsiVisitor.kt
index 4fdf6e8..3cbc51b 100644
--- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/visitor/CollectAnnotatedSymbolsPsiVisitor.kt
+++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/common/visitor/CollectAnnotatedSymbolsPsiVisitor.kt

@@ -1,4 +1,4 @@
-package com.google.devtools.ksp.impl.visitor
+package com.google.devtools.ksp.common.visitor
 
 import com.google.devtools.ksp.impl.symbol.kotlin.toLocation
 import com.intellij.psi.PsiAnnotation

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt
index 2f9a112..e064c0c 100644
--- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt
+++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt

@@ -21,10 +21,12 @@
 
 import com.google.devtools.ksp.common.AnyChanges
 import com.google.devtools.ksp.common.KSObjectCacheManager
+import com.google.devtools.ksp.common.impl.AAResolutionStrategy
 import com.google.devtools.ksp.common.impl.CodeGeneratorImpl
 import com.google.devtools.ksp.common.impl.JsPlatformInfoImpl
 import com.google.devtools.ksp.common.impl.JvmPlatformInfoImpl
 import com.google.devtools.ksp.common.impl.NativePlatformInfoImpl
+import com.google.devtools.ksp.common.impl.PsiResolutionStrategy
 import com.google.devtools.ksp.common.impl.UnknownPlatformInfoImpl
 import com.google.devtools.ksp.impl.symbol.kotlin.Deferrable
 import com.google.devtools.ksp.impl.symbol.kotlin.KSFileImpl