Skip to content
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.

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

fix nested annotation type resolution with usesite target #1447

Merged
merged 2 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ class ResolverImpl(
return getKSTypeCached(it, type.element.typeArguments, type.annotations)
}
}
val scope = resolveSession.fileScopeProvider.getFileResolutionScope(typeReference.containingKtFile)
val scope = typeReference.findLexicalScope()
return resolveSession.typeResolver.resolveType(scope, typeReference, bindingTrace, false).let {
getKSTypeCached(it, type.element.typeArguments, type.annotations)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,12 @@ class KSPCompilerPluginTest : AbstractKSPCompilerPluginTest() {
runTest("../test-utils/testData/api/multipleModules.kt")
}

@TestMetadata("nestedAnnotations.kt")
@Test
fun testNestedAnnotations() {
runTest("../test-utils/testData/api/nestedAnnotations.kt")
}

@TestMetadata("nestedClassType.kt")
@Test
fun testNestedClassType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,12 @@ class KSPAATest : AbstractKSPAATest() {
runTest("../test-utils/testData/api/multipleModules.kt")
}

@TestMetadata("nestedAnnotations.kt")
@Test
fun testNestedAnnotations() {
runTest("../test-utils/testData/api/nestedAnnotations.kt")
}

@Disabled
@TestMetadata("nestedClassType.kt")
@Test
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Copyright 2023 Google LLC
* Copyright 2010-2023 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.processor

import com.google.devtools.ksp.getClassDeclarationByName
import com.google.devtools.ksp.processing.Resolver
import com.google.devtools.ksp.symbol.KSAnnotated

class NestedAnnotationProcessor : AbstractTestProcessor() {
val result = mutableListOf<String>()

override fun toResult(): List<String> {
return result
}

override fun process(resolver: Resolver): List<KSAnnotated> {
val myClass = resolver.getClassDeclarationByName("MyClass")!!
val param = myClass.primaryConstructor!!.parameters.single()
param.annotations.forEach { annotation ->
result.add("$annotation: ${annotation.annotationType.resolve()}")
}
return emptyList()
}
}
26 changes: 26 additions & 0 deletions test-utils/testData/api/nestedAnnotations.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* Copyright 2023 Google LLC
* Copyright 2010-2023 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.
*/

// TEST PROCESSOR: NestedAnnotationProcessor
// EXPECTED:
// @MyNestedAnnotation: MyNestedAnnotation
// END

class MyClass(@param:MyNestedAnnotation param: String) {
annotation class MyNestedAnnotation
}

Loading