Commit c61fe6a 1 parent 7605f9b commit c61fe6a Copy full SHA for c61fe6a
File tree 3 files changed +9
-4
lines changed
main/kotlin/com/google/devtools/ksp/processing/impl
test/kotlin/com/google/devtools/ksp/test
3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -57,6 +57,7 @@ import com.intellij.psi.impl.source.PsiClassReferenceType
57
57
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
58
58
import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
59
59
import org.jetbrains.kotlin.codegen.ClassBuilderMode
60
+ import org.jetbrains.kotlin.codegen.OwnerKind
60
61
import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter
61
62
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
62
63
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
@@ -892,13 +893,17 @@ class ResolverImpl(
892
893
893
894
@KspExperimental
894
895
override fun getJvmName (accessor : KSPropertyAccessor ): String? {
895
- return resolvePropertyAccessorDeclaration(accessor)?.let (typeMapper::mapFunctionName)
896
+ return resolvePropertyAccessorDeclaration(accessor)?.let {
897
+ typeMapper.mapFunctionName(it, OwnerKind .IMPLEMENTATION )
898
+ }
896
899
}
897
900
898
901
@KspExperimental
899
902
override fun getJvmName (declaration : KSFunctionDeclaration ): String? {
900
903
// function names might be mangled if they receive inline class parameters or they are internal
901
- return (resolveFunctionDeclaration(declaration) as ? FunctionDescriptor )?.let (typeMapper::mapFunctionName)
904
+ return (resolveFunctionDeclaration(declaration) as ? FunctionDescriptor )?.let {
905
+ typeMapper.mapFunctionName(it, OwnerKind .IMPLEMENTATION )
906
+ }
902
907
}
903
908
904
909
@KspExperimental
Original file line number Diff line number Diff line change @@ -185,7 +185,7 @@ abstract class AbstractKSPTest(frontend: FrontendKind<*>) : DisposableTest() {
185
185
" -classpath" , classpath,
186
186
" -d" , module.outDir.path
187
187
)
188
- compileJavaFiles(javaFiles, options)
188
+ compileJavaFiles(javaFiles, options, assertions = JUnit5Assertions )
189
189
}
190
190
191
191
fun runTest (@TestDataFile path : String ) {
Original file line number Diff line number Diff line change 1
1
# Copied from kotlinc
2
2
org.gradle.jvmargs =-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8
3
3
4
- kotlinBaseVersion =2.1.20-Beta1
4
+ kotlinBaseVersion =2.1.10-RC
5
5
agpBaseVersion =7.3.1
6
6
agpTestVersion =8.7.1
7
7
intellijVersion =233.13135.128
You can’t perform that action at this time.
0 commit comments